Mercurial > hg
view tests/test-mq-pull-from-bundle.out @ 6743:86e8187b721a
simplify flag handling
add _checklink var to dirstate
introduce dirstate.flagfunc
switch users of util.execfunc/linkfunc to flagfunc
change manifestdict.set to take a flags string
change ctx.fileflags to ctx.flags
change gitmode func to a dict
remove util.execfunc/linkfunc
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 26 Jun 2008 13:46:34 -0500 |
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