Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-excessive-merge @ 1828:ca82f20b0c19
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 03 Mar 2006 08:44:37 -0800 |
parents | ef8cd889a78b |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh hg init echo foo > a echo foo > b hg add a b hg ci -m "test" -d "0 0" echo blah > a hg ci -m "branch a" -d "0 0" hg co 0 echo blah > b hg ci -m "branch b" -d "0 0" HGMERGE=true hg up -m 1 hg ci -m "merge b/a -> blah" -d "0 0" hg co 1 HGMERGE=true hg up -m 2 hg ci -m "merge a/b -> blah" -d "0 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