tests/test-merge5.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Tue, 08 Aug 2006 21:42:50 -0700
changeset 2821 2e4ace008c94
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
mq: new commands qselect, qguard implement quilt-style guards for mq. guards allow to control whether patch can be pushed. if guard X is active and patch is guarded by +X (called "posative guard"), patch can be pushed. if patch is guarded by -X (called "nagative guard"), patch cannot be pushed and is skipped. use qguard to set/list guards on patches. use qselect to set/list active guards. also "qseries -v" prints guarded patches with "G" now.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)