##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

mq: preserve --git flag when merging patches...
mq: preserve --git flag when merging patches Without this, merging a patch queue without diff.git=1 downgrades all git patches to regular patches, losing data in the process.
Mads Kiilerich - - Load All Authors

File last commit:

r9110:561ff8d9 default
r10185:7637fe4f stable
Show More
test-mq-qfold.out
27 lines | 277 B | text/plain | TextLexer
/ tests / test-mq-qfold.out
History | Annotation | Raw |Copy content |Copy permalink
% 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