Mercurial > hg
view tests/test-merge7 @ 7007:a6b74fbb5ce0
fetch: added support for named branches
Previously, fetch didn't really work when there were multiple named branches
in the repository. Now it tries to do the right thing(tm) in all situations.
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Mon, 08 Sep 2008 12:55:46 +0200 |
parents | 7c36a4fb05a3 |
children |
line wrap: on
line source
#!/bin/sh # initial hg init test-a cd test-a cat >test.txt <<"EOF" 1 2 3 EOF hg add test.txt hg commit -m "Initial" -d "1000000 0" # clone cd .. hg clone test-a test-b # change test-a cd test-a cat >test.txt <<"EOF" one two three EOF hg commit -m "Numbers as words" -d "1000000 0" # change test-b cd ../test-b cat >test.txt <<"EOF" 1 2.5 3 EOF hg commit -m "2 -> 2.5" -d "1000000 0" # now pull and merge from test-a hg pull ../test-a hg merge # resolve conflict cat >test.txt <<"EOF" one two-point-five three EOF rm -f *.orig hg resolve -m test.txt hg commit -m "Merge 1" -d "1000000 0" # change test-a again cd ../test-a cat >test.txt <<"EOF" one two-point-one three EOF hg commit -m "two -> two-point-one" -d "1000000 0" # pull and merge from test-a again cd ../test-b hg pull ../test-a hg merge --debug cat test.txt hg debugindex .hg/store/data/test.txt.i hg log