Mercurial > hg
view tests/test-merge1.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 | 3682a19bb637 |
children | d8143769e1d4 |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head %% no merges expected changeset: 0:98e00378acd0 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: commit #0 changeset: 1:4ee19afe4659 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: commit #1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) diff -r d9e5953b9dec b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +This is file b1 M b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head %% merge should fail abort: untracked file in working directory differs from file in requested revision: 'b' %% merge of b expected merging for b merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) diff -r d9e5953b9dec b --- /dev/null +++ b/b @@ -0,0 +1,1 @@ +This is file b2 M b %% 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head Contents of b should be "this is file b1" This is file b1 %% merge fails abort: outstanding uncommitted changes (use 'hg status' to list changes) %% merge expected! 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) diff -r c1dd73cbf59f b --- a/b +++ b/b @@ -1,1 +1,1 @@ -This is file b1 +This is file b22 M b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head %% merge of b should fail abort: outstanding uncommitted changes (use 'hg status' to list changes) %% merge of b expected merging for b merging b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) diff -r c1dd73cbf59f b --- a/b +++ b/b @@ -1,1 +1,1 @@ -This is file b1 +This is file b33 M b