view tests/test-mq-pull-from-bundle.out @ 11184:7d99edddbaea

extdiff: add labels, read diff arguments from [merge-tools]

hgtk has been using these same configs since Feb. Users only have to name the
tools they would like to use, ex:

[extdiff]
kdiff3 =
meld =

====== Setup main
adding one
====== Bundle main
2 changesets found
====== Incoming to fresh repo
>> hg -R fresh incoming main.hg
comparing with main.hg
0: main: one added.
1: main: one updated.
>> hg -R fresh incoming bundle:fresh+main.hg
comparing with bundle:fresh+main.hg
0: main: one added.
1: main: one updated.
====== Setup queue
adding two
popping two.patch
patch queue now empty
====== Bundle queue
1 changesets found
====== Clone base
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
====== Incoming queue bundle
>> hg -R .hg/patches incoming ../queue.hgq
comparing with ../queue.hgq
0: queue: two.patch added.
====== Pull queue bundle
>> hg -R .hg/patches pull --update ../queue.hgq
pulling from ../queue.hgq
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
merging series
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
>> hg -R .hg/patches heads
0: queue: two.patch added.
>> hg -R .hg/patches log
0: queue: two.patch added.
>> hg qseries
two.patch
====== Clone base again
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
====== Unbundle queue bundle
>> hg -R .hg/patches unbundle --update ../queue.hgq
adding changesets
adding manifests
adding file changes
added 1 changesets with 3 changes to 3 files
merging series
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
>> hg -R .hg/patches heads
0: queue: two.patch added.
>> hg -R .hg/patches log
0: queue: two.patch added.
>> hg qseries
two.patch