Mercurial > public > mercurial-scm > hg-stable
diff tests/test-merge1 @ 1581:db10b7114de0
abort when merging two heads and repository has local changes
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Wed, 14 Dec 2005 22:19:03 -0600 |
| parents | 67a28636ea64 |
| children | 7544700fd931 |
line wrap: on
line diff
--- a/tests/test-merge1 Wed Dec 14 22:12:18 2005 -0600 +++ b/tests/test-merge1 Wed Dec 14 22:19:03 2005 -0600 @@ -40,8 +40,10 @@ hg add c hg commit -m "commit #2" -d "0 0" echo This is file b2 > b +echo %% merge should fail +env HGMERGE=../merge hg update -m 1 echo %% merge of b expected -env HGMERGE=../merge hg update -m 1 +env HGMERGE=../merge hg update -f -m 1 cd ..; /bin/rm -rf t echo %% @@ -65,8 +67,10 @@ cat b echo This is file b22 > b +echo %% merge fails +env HGMERGE=../merge hg update -m 2 echo %% merge expected! -env HGMERGE=../merge hg update -m 2 +env HGMERGE=../merge hg update -f -m 2 cd ..; /bin/rm -rf t mkdir t @@ -85,6 +89,8 @@ hg add c hg commit -m "commit #3" -d "0 0" echo This is file b33 > b -echo %% merge of b expected +echo %% merge of b should fail env HGMERGE=../merge hg update -m 2 +echo %% merge of b expected +env HGMERGE=../merge hg update -f -m 2 cd ..; /bin/rm -rf t