Mercurial > hg > pyhgsh
view tests/test-excessive-merge @ 2052:c0b945c5df08
Added tag 0.8.1 for changeset 6a03cff2b0f5d30281e6addefe96b993582f2eac
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 07 Apr 2006 20:08:11 -0500 |
parents | 7544700fd931 |
children | e506c14382fd |
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 up -m 1 hg ci -m "merge b/a -> blah" -d "1000000 0" hg co 1 HGMERGE=true hg up -m 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