diff options
| author |  Brad King <brad.king@kitware.com> | 2011-10-13 08:59:04 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-10-13 10:16:59 -0700 |
| commit | 72251b7de6daf2cd7916e3aad46df0047e5a5d2b (patch) | |
| tree | 76ab58c1b7c1efec10656c6e45dbaa70192b35f6 /t/t5100/msg0016 | |
| parent | Update draft release notes to 1.7.8 (diff) | |
| download | tgif-72251b7de6daf2cd7916e3aad46df0047e5a5d2b.tar.xz | |
submodule: Demonstrate known breakage during recursive merge
Since commit 68d03e4a (Implement automatic fast-forward merge for
submodules, 2010-07-07) we try to suggest submodule commits that resolve
a conflict. Consider a true recursive merge case
b---bc
/ \ /
o X
\ / \
c---cb
in which the two heads themselves (bc,cb) had resolved a submodule
conflict (i.e. reference different commits than their parents). The
submodule merge search runs during the temporary merge of the two merge
bases (b,c) and prints out a suggestion that is not meaningful to the
user. Then during the main merge the submodule merge search runs again
but dies with the message
fatal: --ancestry-path given but there are no bottom commits
while trying to enumerate candidates. Demonstrate this known breakage
with a new test in t7405-submodule-merge covering the case.
Signed-off-by: Brad King <brad.king@kitware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5100/msg0016')
0 files changed, 0 insertions, 0 deletions