test-mq-qfold.out
70 lines
| 787 B
| text/plain
|
TextLexer
/ tests / test-mq-qfold.out
Patrick Mezard
|
r8426 | % init | ||
adding a | ||||
% fold in the middle of the queue | ||||
Mads Kiilerich
|
r9110 | popping p3 | ||
popping p2 | ||||
Patrick Mezard
|
r8426 | 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 | ||||
Patrick Mezard
|
r10186 | reverting a | ||
% fold git patch into a regular patch, expect git patch | ||||
popping git | ||||
now at: regular | ||||
Steve Losh
|
r10397 | # HG changeset patch | ||
# Parent | ||||
Patrick Mezard
|
r10186 | 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 | ||||
Steve Losh
|
r10397 | # HG changeset patch | ||
# Parent | ||||
Patrick Mezard
|
r10186 | diff --git a/a b/aa | ||
copy from a | ||||
copy to aa | ||||
--- a/a | ||||
+++ b/aa | ||||
@@ -1,3 +1,4 @@ | ||||
a | ||||
a | ||||
b | ||||
+b | ||||