Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge7 @ 2314:e9b5749e4de3
Remove quotes from patch command.
When the gpatch fix for solaris was introduced in 67a0a3852024 the
patch command was "". For some strange reason windows 2000 is
not happy with those quotes when given in os.popen.
author | Volker Kleinfeld <Volker.Kleinfeld@gmx.de> |
---|---|
date | Thu, 18 May 2006 22:35:41 -0700 |
parents | e506c14382fd |
children | c0b449154a90 |
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 HGMERGE=merge hg merge # resolve conflict cat >test.txt <<"EOF" one two-point-five three EOF rm -f *.orig 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 HGMERGE=merge hg merge --debug cat test.txt | sed "s% .*%%" hg debugindex .hg/data/test.txt.i hg log