tests/test-mq-qfold.out
author Abderrahim Kitouni <a.kitouni@gmail.com>
Sat, 04 Jul 2009 14:18:15 +0100
changeset 9092 9aebeea7ac00
parent 8426 2ff17c4de1da
child 9110 561ff8d9e4f0
permissions -rw-r--r--
subrepo: use hg.repository instead of creating localrepo directly this way, extensions' reposetup will be called, which allows for git subrepos to be handled by hg-git (and I believe the same goes for svn and hgsubversion)

% 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