view tests/test-mq-pull-from-bundle.out @ 6543:a6e2e60b34d0

convert: handle past or foreign partial svn copies Subversion allows revisions to be composed of subparts coming from revisions before the parent or from other part of the repository. There is no simple representation for these now, keep the changes but do not track their origins.
author Patrick Mezard <pmezard@gmail.com>
date Mon, 14 Apr 2008 22:31:34 +0200
parents 0750f11152fe
children fb32ae9c76e7
line wrap: on
line source

====== 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
Patch queue now empty
====== Bundle queue
1 changesets found
====== Clone base
updating working directory
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 working directory
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