Mercurial > hg
annotate tests/test-convert-darcs.out @ 9110:561ff8d9e4f0
mq: qpop now tells which patches are popped
When navigating through a patch series by qpushing and qpopping it was easy to
get lost because qpop was silent. I found myself often running qnext after qpop
to see which patch I just dropped - especially if I was about to qrm it. This
patch makes qpop more symmetric to qpush by showing which patches are
applied/"unapplied".
I think it is a good change even though it changes output by adding a new line
of output.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Thu, 09 Jul 2009 23:59:03 +0200 |
| parents | f29b7c8419cb |
| children | b236f34ec1e9 |
| rev | line source |
|---|---|
| 5413 | 1 % initialize darcs repo |
| 2 Finished recording patch 'p0' | |
| 3 % branch and update | |
| 4 Finished recording patch 'p1.1' | |
| 5 % update source | |
| 6 Finished recording patch 'p1.2' | |
| 7 % merge branch | |
| 8 We have conflicts in the following files: | |
| 9 ./a | |
| 10 Finished pulling and applying. | |
| 11 Finished recording patch 'p2' | |
| 12 initializing destination darcs-repo-hg repository | |
| 13 scanning source... | |
| 14 sorting... | |
| 15 converting... | |
| 16 3 p0 | |
| 17 2 p1.2 | |
| 18 1 p1.1 | |
| 19 0 p2 | |
| 20 o 3 "p2" files: a | |
| 21 | | |
| 22 o 2 "p1.1" files: | |
| 23 | | |
| 24 o 1 "p1.2" files: a b | |
| 25 | | |
| 26 o 0 "p0" files: a | |
| 27 | |
| 28 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a | |
| 29 1e88685f5ddec574a34c70af492f95b6debc8741 644 b |