Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-excessive-merge @ 2749:d13e4ffaa79d
[darcs2hg] Windows compatibilty patct
Originally submitted by Daiju Kito
1. single quote didn't work in several cases
2. os.unlink tries to delete tmpfile when it's called. It won't wait like unix.
author | Sébastien Pierre <sebastien@xprima.com> |
---|---|
date | Tue, 01 Aug 2006 09:51:36 -0400 |
parents | e506c14382fd |
children | ad3d5b4367cb |
line wrap: on
line source
#!/bin/sh hg init echo foo > a echo foo > b hg add a b hg ci -m "test" -d "1000000 0" echo blah > a hg ci -m "branch a" -d "1000000 0" hg co 0 echo blah > b hg ci -m "branch b" -d "1000000 0" HGMERGE=true hg merge 1 hg ci -m "merge b/a -> blah" -d "1000000 0" hg co 1 HGMERGE=true hg merge 2 hg ci -m "merge a/b -> blah" -d "1000000 0" hg log hg debugindex .hg/00changelog.i echo echo 1 hg manifest 1 echo 2 hg manifest 2 echo 3 hg manifest 3 echo 4 hg manifest 4 echo hg debugindex .hg/data/a.i hg verify