Mercurial > hg
view tests/test-mq-pull-from-bundle.out @ 5785:38cd1ce8650d
patchbomb: add linebreaks after colons (coding style)
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Sun, 30 Dec 2007 14:24:03 +0100 |
parents | e20de0caf8e7 |
children | bc784304fea1 |
line wrap: on
line source
====== .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 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 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