Mercurial > public > mercurial-scm > hg
diff tests/test-mq-merge @ 5527:0b3f910dfd17
mq: really remove undo after a qpush (and after a strip)
For qpush, removeundo has to be called after the transaction has finished.
strip may use unbundle, which also leaves an undo file.
Fixes issue780.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Fri, 09 Nov 2007 20:21:35 -0200 |
| parents | a210b40d0860 |
| children | f18f14bae172 |
line wrap: on
line diff
--- a/tests/test-mq-merge Fri Nov 09 20:21:35 2007 -0200 +++ b/tests/test-mq-merge Fri Nov 09 20:21:35 2007 -0200 @@ -7,6 +7,13 @@ sed -e 's:\\:/:g' -e 's:[^ ]*/t/::g' } +checkundo() +{ + if [ -f .hg/store/undo ]; then + echo ".hg/store/undo still exists after $1" + fi +} + echo "[extensions]" >> $HGRCPATH echo "hgext.mq=" >> $HGRCPATH @@ -25,6 +32,7 @@ # Save the patch queue so we can merge it later hg qsave -c -e 2>&1 | rewrite_path +checkundo qsave # Update b and commit in an "update" changeset hg up -C init @@ -36,6 +44,7 @@ # The system cannot find the file specified => a hg manifest hg qpush -a -m 2>&1 | rewrite_path +checkundo 'qpush -m' hg manifest # ensure status is correct after merge