| commit | 5352a82bab7422fea53679d56fdef878d51b7968 | |
| author | Stephan Beyer <s-beyer@gmx.net> | |
| Sat, 12 Jul 2008 15:47:31 +0000 (12 17:47 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Jul 2008 23:08:27 +0000 (13 16:08 -0700) | ||
| tree | 54127ad43e7ed25956ce76a1291cb1e7b30291d6 | treesnapshot (tar.gz zip) |
| parent | 356a32a23a2118e12a62fa42876a261feb554b1a | commitdiff |
t3404: test two "preserve merges with -p" cases
There are two cases for preserving merges:
1. The merge base is outside the trunk that is to be rebased.
Then commits of those other parents must not be picked.
2. The merge base is inside the trunk that is to be rebased.
Then all the commits related to that merge must be picked
and the merge must be redone.
The "preserve merges with -p" test case tested for case 1 only.
This patch adds case 2.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
There are two cases for preserving merges:
1. The merge base is outside the trunk that is to be rebased.
Then commits of those other parents must not be picked.
2. The merge base is inside the trunk that is to be rebased.
Then all the commits related to that merge must be picked
and the merge must be redone.
The "preserve merges with -p" test case tested for case 1 only.
This patch adds case 2.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3404-rebase-interactive.sh | diffblobblamehistory |