On 7/6/2018 6:57 PM, Junio C Hamano wrote:
I'll be pushing out the integration branches with some updates, but
there is no change in 'next' and below. The following topics I gave
a quick look and gave them topic branches, but I had trouble merging
them in 'pu' and making them work correctly or pass the tests, so
they are not part of 'pu' in today's pushout.
pk/rebase-in-c
en/dirty-merge-fixes
en/t6036-merge-recursive-tests
en/t6042-insane-merge-rename-testcases
ds/multi-pack-index
I tested merging ds/multi-pack-index against the latest pu and the only
issue I had was with header files being added to 'packfile.c' and
'building/repack.c'. Both were that I added "#include <midx.h>" and
cc/remote-odb added "#include <remote-odb.h>".
After resolving those conflicts, I could compile and test as normal. My
series did not include any new test failures to these that are already
failing on current pu:
t0410-partial-clone.sh (Wstat: 256 Tests: 16
Failed: 2)
Failed tests: 15-16
Non-zero exit status: 1
t1302-repo-version.sh (Wstat: 256 Tests: 15
Failed: 1)
Failed test: 15
Non-zero exit status: 1
t1304-default-acl.sh (Wstat: 256 Tests: 4
Failed: 1)
Failed test: 4
Non-zero exit status: 1
t3306-notes-prune.sh (Wstat: 256 Tests: 12
Failed: 2)
Failed tests: 3, 10
Non-zero exit status: 1
t5304-prune.sh (Wstat: 256 Tests: 26
Failed: 11)
Failed tests: 1, 4, 6, 12-18, 20
Non-zero exit status: 1
t5502-quickfetch.sh (Wstat: 256 Tests: 7
Failed: 1)
Failed test: 7
Non-zero exit status: 1
t5318-commit-graph.sh (Wstat: 256 Tests: 63
Failed: 1)
Failed test: 41
Non-zero exit status: 1
t5500-fetch-pack.sh (Wstat: 256 Tests: 356
Failed: 1)
Failed test: 43
Non-zero exit status: 1
t6014-rev-list-all.sh (Wstat: 256 Tests: 4
Failed: 1)
Failed test: 3
Non-zero exit status: 1
t6500-gc.sh (Wstat: 256 Tests: 10
Failed: 5)
Failed tests: 2-3, 6-7, 9
Non-zero exit status: 1
t6501-freshen-objects.sh (Wstat: 256 Tests: 29
Failed: 7)
Failed tests: 7, 12, 20, 25, 27-29
Non-zero exit status: 1
t7701-repack-unpack-unreachable.sh (Wstat: 256 Tests: 7
Failed: 1)
Failed test: 5
Non-zero exit status: 1
t9300-fast-import.sh (Wstat: 256 Tests: 183
Failed: 1)
Failed test: 88
Non-zero exit status: 1
Should I rebase onto cc/remote-odb to avoid these conflicts in the
future? Or, were there more merge conflicts with the other "not cooking"
branches?
Thanks,
-Stolee
