Mercurial > hg
view tests/test-convert-hg-source.out @ 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 | 11e1e574da02 |
| children | 180a3eee4b75 |
line wrap: on
line source
merging baz and foo 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved merging foo and baz 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) initializing destination new repository scanning source... sorting... converting... 4 add foo bar 3 change foo 2 make bar and baz copies of foo 1 merge local copy 0 merge remote copy comparing with ../orig searching for changes no changes found