Mercurial > hg
view tests/test-rebase-pull.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 | dd1b47e17d7e |
children | a3d73b3e1f8a |
line wrap: on
line source
updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved updating working directory 2 files updated, 0 files merged, 0 files removed, 0 files unresolved % Now b has one revision to be pulled from a pulling from searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) saving bundle to adding branch adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files rebase completed @ 3:L1 | o 2:R1 | o 1:C2 | o 0:C1 % Re-run pull --rebase pulling from searching for changes no changes found % Invoke pull --rebase and nothing to rebase pulling from searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) nothing to rebase @ 2 | % pull --rebase --update should ignore --update pulling from searching for changes no changes found % pull --rebase doesn't update if nothing has been pulled 0 files updated, 0 files merged, 1 files removed, 0 files unresolved pulling from searching for changes no changes found o 2 |