tests/test-mq-qfold.out
author Gilles Moris <gilles.moris@free.fr>
Fri, 06 Nov 2009 09:35:38 +0100
changeset 9811 c92ac5a56f69
parent 9110 561ff8d9e4f0
child 10186 296a0b14a686
permissions -rw-r--r--
buildrpm: enable to start the script from anywhere Previously the script worked only from the hg root.

% 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