Mercurial > hg

comparison 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
comparison
equal deleted inserted replaced
8425:73d80d5bf478 8426:2ff17c4de1da
1 % init
2 adding a
3 % fold in the middle of the queue
4 now at: p1
5 --- a/a
6 +++ b/a
7 @@ -1,1 +1,2 @@
8 a
9 +a
10 p1
11 p3
12 --- a/a
13 +++ b/a
14 @@ -1,1 +1,3 @@
15 a
16 +a
17 +b
18 % fold with local changes
19 abort: local changes found, refresh first
20 --- a/a
21 +++ b/a
22 @@ -1,1 +1,3 @@
23 a
24 +a
25 +b