##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

commit: when committing the results of a merge, it's all or nothing...
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.
Adrian Buehlmann - - Load All Authors

File last commit:

r6338:0750f111 default
r6385:0d4e068e default
Show More
test-mq-pull-from-bundle.out
58 lines | 1.6 KiB | text/plain | TextLexer
/ tests / test-mq-pull-from-bundle.out
History | Source | Raw |Copy content |Copy permalink
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 ====== Setup main
adding one
====== Bundle main
Thomas Arendsen Hein
Show number of changesets written to bundle files by default (issue569)...
 r5763 2 changesets found
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 ====== 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
Patch queue now empty
====== Bundle queue
Thomas Arendsen Hein
Show number of changesets written to bundle files by default (issue569)...
 r5763 1 changesets found
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 ====== Clone base
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 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
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Peter Arrenbrecht
Fix income/pull with bundle and -R (issue 820)....
 r5664 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