mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
18fb9f5e5e
Uses ui.setconfig() to tell bundlerepo where the main repo is. This is needed for when the --repository option is used. Adds tests to test-bundle and a new test script test-mq-pull-from-bundle, which plays out the situation that initially made me detect this bug (hg -R .hg/patches pull ../bundle.hg).
69 lines
1.7 KiB
Plaintext
69 lines
1.7 KiB
Plaintext
====== .hgrc
|
|
[ui]
|
|
slash = True
|
|
[defaults]
|
|
backout = -d "0 0"
|
|
commit = -d "0 0"
|
|
debugrawcommit = -d "0 0"
|
|
tag = -d "0 0"
|
|
[extensions]
|
|
mq=
|
|
[defaults]
|
|
log = --template "{rev}: {desc}\n"
|
|
heads = --template "{rev}: {desc}\n"
|
|
incoming = --template "{rev}: {desc}\n"
|
|
====== Setup main
|
|
adding one
|
|
====== Bundle main
|
|
====== 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
|
|
====== Clone base
|
|
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
|
|
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
|