-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Teach "-X <option>" command line argument to "git merge" that is passed to strategy implementations. "ours" and "theirs" autoresolution introduced by the previous commit can be asked to the recursive strategy. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
- Loading branch information
Avery Pennarun
authored and
Junio C Hamano
committed
Jan 18, 2010
1 parent
73eb40e
commit 8cc5b29
Showing
11 changed files
with
162 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
#!/bin/sh | ||
|
||
test_description='Merge-recursive ours and theirs variants' | ||
. ./test-lib.sh | ||
|
||
test_expect_success setup ' | ||
for i in 1 2 3 4 5 6 7 8 9 | ||
do | ||
echo "$i" | ||
done >file && | ||
git add file && | ||
cp file elif && | ||
git commit -m initial && | ||
sed -e "s/1/one/" -e "s/9/nine/" >file <elif && | ||
git commit -a -m ours && | ||
git checkout -b side HEAD^ && | ||
sed -e "s/9/nueve/" >file <elif && | ||
git commit -a -m theirs && | ||
git checkout master^0 | ||
' | ||
|
||
test_expect_success 'plain recursive - should conflict' ' | ||
git reset --hard master && | ||
test_must_fail git merge -s recursive side && | ||
grep nine file && | ||
grep nueve file && | ||
! grep 9 file && | ||
grep one file && | ||
! grep 1 file | ||
' | ||
|
||
test_expect_success 'recursive favouring theirs' ' | ||
git reset --hard master && | ||
git merge -s recursive -Xtheirs side && | ||
! grep nine file && | ||
grep nueve file && | ||
! grep 9 file && | ||
grep one file && | ||
! grep 1 file | ||
' | ||
|
||
test_expect_success 'recursive favouring ours' ' | ||
git reset --hard master && | ||
git merge -s recursive -X ours side && | ||
grep nine file && | ||
! grep nueve file && | ||
! grep 9 file && | ||
grep one file && | ||
! grep 1 file | ||
' | ||
|
||
test_done |