| commit | 32192e6622d78347448cfc0572827d6e64e0de28 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 11 Jun 2005 09:50:51 +0000 (11 02:50 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Mon, 13 Jun 2005 03:40:20 +0000 (12 20:40 -0700) | ||
| tree | 460a1aa7e3734888a6e25721c11e39deede40084 | treesnapshot (tar.gz zip) |
| parent | e7f9bc411c8519468c33e1d882fb02cbe9c1ea55 | commitdiff |
[PATCH] Finish making --emu23 equivalent to pure 2-way merge.
This adds #3ALT rule (and #2ALT rule for symmetry) to the
read-tree 3-way merge logic that collapses paths that are added
only in one branch and not in the other internally.
This makes --emu23 to succeed in the last remaining case where
the pure 2-way merge succeeded and earlier one failed. Running
diff between t1001 and t1005 test scripts shows that the only
difference between the two is that --emu23 can leave the states
into separate stages so that the user can use usual 3-way merge
resolution techniques to carry forward the local changes when
pure 2-way merge would have refused to run.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This adds #3ALT rule (and #2ALT rule for symmetry) to the
read-tree 3-way merge logic that collapses paths that are added
only in one branch and not in the other internally.
This makes --emu23 to succeed in the last remaining case where
the pure 2-way merge succeeded and earlier one failed. Running
diff between t1001 and t1005 test scripts shows that the only
difference between the two is that --emu23 can leave the states
into separate stages so that the user can use usual 3-way merge
resolution techniques to carry forward the local changes when
pure 2-way merge would have refused to run.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| read-tree.c | diffblobblamehistory | |
| t/t1000-read-tree-m-3way.sh | diffblobblamehistory | |
| t/t1005-read-tree-m-2way-emu23.sh | diffblobblamehistory |