Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-mq-merge.out
author Mads Kiilerich <mads@kiilerich.com>
Thu, 18 Sep 2008 13:48:41 +0200
changeset 7041 b856071435f7
parent 6628 f18f14bae172
child 7627 fb32ae9c76e7
permissions -rw-r--r--
tests: fix readline escape characters in output for test-doctest.py
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4333
4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     1
 
adding a
4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     2
 
adding b
4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     3
 
copy .hg/patches to .hg/patches.1
4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     4
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     5
 
M b
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 4437
diff changeset 
     6
 
created new head
4333
4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     7
 
a
4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     8
 
b
4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     9
 
merging with queue at: .hg/patches.1
4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    10
 
applying rm_a
4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    11
 
Now at: rm_a
4f721e96f1de Add test for issue 529 - "mq aborts when merging patch deleting files".
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    12
 
b
4437
a210b40d0860 Make mergepatch save queue now that qpush isn't.
Brendan Cully <brendan@kublai.com>
parents: 4333
diff changeset 
    13
 
Patch queue now empty
6628
f18f14bae172 test-mq-merge: test mq merge and explicit patch queue
Patrick Mezard <pmezard@gmail.com>
parents: 6336
diff changeset 
    14
 












f18f14bae172
test-mq-merge: test mq merge and explicit patch queue



Patrick Mezard <pmezard@gmail.com>


parents: 
6336

diff
changeset




    15


% init t2












f18f14bae172
test-mq-merge: test mq merge and explicit patch queue



Patrick Mezard <pmezard@gmail.com>


parents: 
6336

diff
changeset




    16


adding a












f18f14bae172
test-mq-merge: test mq merge and explicit patch queue



Patrick Mezard <pmezard@gmail.com>


parents: 
6336

diff
changeset




    17


1 files updated, 0 files merged, 0 files removed, 0 files unresolved












f18f14bae172
test-mq-merge: test mq merge and explicit patch queue



Patrick Mezard <pmezard@gmail.com>


parents: 
6336

diff
changeset




    18


% create the reference queue












f18f14bae172
test-mq-merge: test mq merge and explicit patch queue



Patrick Mezard <pmezard@gmail.com>


parents: 
6336

diff
changeset




    19


1 files updated, 0 files merged, 0 files removed, 0 files unresolved












f18f14bae172
test-mq-merge: test mq merge and explicit patch queue



Patrick Mezard <pmezard@gmail.com>


parents: 
6336

diff
changeset




    20


% merge












f18f14bae172
test-mq-merge: test mq merge and explicit patch queue



Patrick Mezard <pmezard@gmail.com>


parents: 
6336

diff
changeset




    21


merging with queue at refqueue












f18f14bae172
test-mq-merge: test mq merge and explicit patch queue



Patrick Mezard <pmezard@gmail.com>


parents: 
6336

diff
changeset




    22


(working directory not at tip)












f18f14bae172
test-mq-merge: test mq merge and explicit patch queue



Patrick Mezard <pmezard@gmail.com>


parents: 
6336

diff
changeset




    23


applying patcha












f18f14bae172
test-mq-merge: test mq merge and explicit patch queue



Patrick Mezard <pmezard@gmail.com>


parents: 
6336

diff
changeset




    24


Now at: patcha














mercurial