Mercurial > hg
view tests/test-mq-merge.out @ 7113:f7fc5f5ecd62
mq: Allow qrefresh --silent to take parameters
'hg qrefresh --short file.txt' now adds changes made to file.txt to current
patch.
This builds on a patch for implementing --amend by Kirill Smelkov as discussed
in issue933.
FIXME: Why do mq refresh have two matchers if we only need one?
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Fri, 17 Oct 2008 21:26:39 +0200 |
parents | f18f14bae172 |
children | fb32ae9c76e7 |
line wrap: on
line source
adding a adding b copy .hg/patches to .hg/patches.1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved M b created new head a b merging with queue at: .hg/patches.1 applying rm_a Now at: rm_a b Patch queue now empty % init t2 adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % create the reference queue 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % merge merging with queue at refqueue (working directory not at tip) applying patcha Now at: patcha