Mercurial > hg

view tests/test-mq-qfold.out @ 9939:251812d34c08 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge stable heads
author Matt Mackall <mpm@selenic.com>
date Wed, 25 Nov 2009 21:54:18 -0600
parents 561ff8d9e4f0
children 296a0b14a686
line wrap: on
line source

% 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