Mercurial > hg

view tests/test-mq-qfold.out @ 9438:b2f3b9c82ac0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add new flag [-1] to synopsis of qapplied/qunapplied
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 11 Sep 2009 16:58:19 +0200
parents 561ff8d9e4f0
children 296a0b14a686
line wrap: on
line source

% init
adding a
% fold in the middle of the queue
popping p3
popping p2
now at: p1
--- a/a
+++ b/a
@@ -1,1 +1,2 @@
 a
+a
p1
p3
--- a/a
+++ b/a
@@ -1,1 +1,3 @@
 a
+a
+b
% fold with local changes
abort: local changes found, refresh first
--- a/a
+++ b/a
@@ -1,1 +1,3 @@
 a
+a
+b