Mercurial > hg

diff tests/test-mq-qfold.out @ 8426:2ff17c4de1da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add tests for qfold
author Patrick Mezard <pmezard@gmail.com>
date Sun, 17 May 2009 19:54:26 +0200
parents
children 561ff8d9e4f0
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-mq-qfold.out	Sun May 17 19:54:26 2009 +0200
@@ -0,0 +1,25 @@
+% 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