Mercurial > hg
view tests/test-commit-unresolved @ 6899:56a7a54e074f
store: simplify walking
- fold in main walking function
- eliminate recursion (especially recursive yielding!)
- eliminate default args
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 13 Aug 2008 20:18:43 -0500 |
parents | 7c36a4fb05a3 |
children | 93609576244e |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "graphlog=" >> $HGRCPATH function addcommit { echo $1 > $1 hg add $1 hg commit -d "${2} 0" -u test -m $1 } function commit { hg commit -d "${2} 0" -u test -m $1 } hg init a cd a addcommit "A" 0 addcommit "B" 1 echo "C" >> A commit "C" 2 hg update -C 0 echo "D" >> A commit "D" 3 echo echo "% Merging a conflict araises" hg merge echo echo "% Correct the conflict without marking the file as resolved" echo "ABCD" > A hg commit -m "Merged" echo echo "% Mark the conflict as resolved and commit" hg resolve -m A hg commit -m "Merged" exit 0