Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-mq-merge @ 4437:a210b40d0860
Make mergepatch save queue now that qpush isn't.
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Sun, 13 May 2007 19:15:54 -0700 |
| parents | 4f721e96f1de |
| children |
comparison
equal
deleted
inserted
replaced
| 4436:a764edb6fc95 | 4437:a210b40d0860 |
|---|---|
| 35 # Here, qpush used to abort with : | 35 # Here, qpush used to abort with : |
| 36 # The system cannot find the file specified => a | 36 # The system cannot find the file specified => a |
| 37 hg manifest | 37 hg manifest |
| 38 hg qpush -a -m 2>&1 | rewrite_path | 38 hg qpush -a -m 2>&1 | rewrite_path |
| 39 hg manifest | 39 hg manifest |
| 40 | |
| 41 # ensure status is correct after merge | |
| 42 hg qpop -a |