Mercurial > hg
view tests/test-issue522 @ 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 | 6c82beaaa11a |
children |
line wrap: on
line source
#!/bin/sh # In the merge below, the file "foo" has the same contents in both # parents, but if we look at the file-level history, we'll notice that # the version in p1 is an ancestor of the version in p2. This test # makes sure that we'll use the version from p2 in the manifest of the # merge revision. hg init repo cd repo echo foo > foo hg ci -qAm 'add foo' echo bar >> foo hg ci -m 'change foo' hg backout -r tip -m 'backout changed foo' hg up -C 0 touch bar hg ci -qAm 'add bar' hg merge --debug hg debugstate | grep foo hg st -A foo hg ci -m 'merge' hg manifest --debug | grep foo hg debugindex .hg/store/data/foo.i