Mercurial > hg > pyhgsh
view tests/test-conflict @ 2259:181b0643ffb1
fix a traceback when unbundling does not add any changesets
only run the hooks when some changesets has been added
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Thu, 11 May 2006 15:01:30 +0200 |
parents | 7544700fd931 |
children | e506c14382fd |
line wrap: on
line source
#!/bin/sh hg init echo "nothing" > a hg add a hg commit -m ancestor -d "1000000 0" echo "something" > a hg commit -m branch1 -d "1000000 0" hg co 0 echo "something else" > a hg commit -m branch2 -d "1000000 0" HGMERGE=merge; export HGMERGE hg up -m 1 hg id egrep -v ">>>|<<<" a hg status