Mercurial > hg > pyhgsh
view tests/test-merge7 @ 1645:c6ffedc4f11b
add removed files to the changelog file list
- this should allow better detection of removed file
when walking in the history (like hg log)
it doesn't help for the fast path of hg log where
we only look at the filelog
- users of the changelog file list shouldn't assume
anymore that the file still exist (anyway it won't
be found in the manifest like in 5ecf05541e11)
- fix the tests (some hashes changed)
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sun, 29 Jan 2006 08:38:31 +1300 |
parents | bf6c91cb816f |
children | 7544700fd931 |
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 "0 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 "0 0" # change test-b cd ../test-b cat >test.txt <<"EOF" 1 2.5 3 EOF hg commit -m "2 -> 2.5" -d "0 0" # now pull and merge from test-a hg pull ../test-a HGMERGE=merge hg update -m # resolve conflict cat >test.txt <<"EOF" one two-point-five three EOF rm -f *.orig hg commit -m "Merge 1" -d "0 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 "0 0" # pull and merge from test-a again cd ../test-b hg pull ../test-a HGMERGE=merge hg update --debug -m cat test.txt | sed "s% .*%%" hg debugindex .hg/data/test.txt.i hg log