Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-mq @ 4065:8ee983e3d461
fix strip'ping the second parent of a merge
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 06 Feb 2007 15:54:58 -0200 |
parents | 4c158de5f245 |
children | 165abe554c80 785ad8cd1d31 |
line wrap: on
line diff
--- a/tests/test-mq +++ b/tests/test-mq @@ -246,3 +246,22 @@ hg mv bleh barney hg qrefresh --git cat .hg/patches/bar hg log -vC --template '{rev} {file_copies%filecopy}\n' -r . + +echo '% strip again' +cd .. +hg init strip +cd strip +touch foo +hg add foo +hg ci -m 'add foo' -d '0 0' +echo >> foo +hg ci -m 'change foo 1' -d '0 0' +hg up -C 0 +echo 1 >> foo +hg ci -m 'change foo 2' -d '0 0' +HGMERGE=true hg merge +hg ci -m merge -d '0 0' +hg log +hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/' +hg log +