tests/test-mq-qfold.out
author Matt Mackall <mpm@selenic.com>
Sat, 13 Jun 2009 18:01:46 -0500
changeset 8799 87d1fd40f57e
parent 8426 2ff17c4de1da
child 9110 561ff8d9e4f0
permissions -rw-r--r--
repo: add internal support for sharing store directories set .hg/sharedpath to point to the .hg to share with

% init
adding a
% fold in the middle of the queue
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