##// END OF EJS Templates
Merge with stable
Merge with stable

File last commit:

r10186:296a0b14 1.4.2 stable
r10276:6109a02c merge default
Show More
test-mq-qfold.out
64 lines | 723 B | text/plain | TextLexer
% 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
reverting a
% fold git patch into a regular patch, expect git patch
popping git
now at: regular
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,3 +1,4 @@
a
a
b
+a
diff --git a/a b/aa
copy from a
copy to aa
--- a/a
+++ b/aa
@@ -1,3 +1,4 @@
a
a
b
+a
popping regular
now at: p1
% fold regular patch into a git patch, expect git patch
popping regular
now at: git
diff --git a/a b/aa
copy from a
copy to aa
--- a/a
+++ b/aa
@@ -1,3 +1,4 @@
a
a
b
+b