test-mq-pull-from-bundle.t
139 lines
| 2.9 KiB
| text/troff
|
Tads3Lexer
/ tests / test-mq-pull-from-bundle.t
Gregory Szorc
|
r37364 | #require repobundlerepo | ||
Adrian Buehlmann
|
r12324 | $ cat <<EOF >> $HGRCPATH | ||
> [extensions] | ||||
> mq= | ||||
> [alias] | ||||
Phil Cohen
|
r35386 | > tlog = log --template "{rev}: {node|short} {desc}\\n" | ||
Adrian Buehlmann
|
r12324 | > theads = heads --template "{rev}: {desc}\\n" | ||
> tincoming = incoming --template "{rev}: {desc}\\n" | ||||
> EOF | ||||
Setup main: | ||||
$ hg init base | ||||
$ cd base | ||||
$ echo "One" > one | ||||
$ hg add | ||||
adding one | ||||
$ hg ci -m "main: one added" | ||||
$ echo "++" >> one | ||||
$ hg ci -m "main: one updated" | ||||
Bundle main: | ||||
$ hg bundle --base=null ../main.hg | ||||
2 changesets found | ||||
$ cd .. | ||||
Incoming to fresh repo: | ||||
$ hg init fresh | ||||
$ hg -R fresh tincoming main.hg | ||||
comparing with main.hg | ||||
0: main: one added | ||||
1: main: one updated | ||||
Klaus Koch
|
r12962 | $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true | ||
Adrian Buehlmann
|
r12324 | |||
$ hg -R fresh tincoming bundle:fresh+main.hg | ||||
comparing with bundle:fresh+main.hg | ||||
0: main: one added | ||||
1: main: one updated | ||||
Setup queue: | ||||
$ cd base | ||||
$ hg qinit -c | ||||
$ hg qnew -m "patch: two added" two.patch | ||||
$ echo two > two | ||||
$ hg add | ||||
adding two | ||||
$ hg qrefresh | ||||
$ hg qcommit -m "queue: two.patch added" | ||||
$ hg qpop -a | ||||
popping two.patch | ||||
patch queue now empty | ||||
Bundle queue: | ||||
$ hg -R .hg/patches bundle --base=null ../queue.hgq | ||||
1 changesets found | ||||
Klaus Koch
|
r12962 | $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true | ||
Adrian Buehlmann
|
r12324 | |||
$ cd .. | ||||
Clone base: | ||||
$ hg clone base copy | ||||
updating to branch default | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd copy | ||||
$ hg qinit -c | ||||
Incoming queue bundle: | ||||
$ hg -R .hg/patches tincoming ../queue.hgq | ||||
comparing with ../queue.hgq | ||||
0: queue: two.patch added | ||||
Klaus Koch
|
r12962 | $ test -f .hg/hg-bundle* && echo 'temp. bundle file remained' || true | ||
Adrian Buehlmann
|
r12324 | |||
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 | ||||
Boris Feld
|
r39516 | new changesets d7553909353d (1 drafts) | ||
Adrian Buehlmann
|
r12324 | merging series | ||
2 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||||
Klaus Koch
|
r12962 | $ test -f .hg/patches/hg-bundle* && echo 'temp. bundle file remained' || true | ||
Adrian Buehlmann
|
r12324 | |||
$ hg -R .hg/patches theads | ||||
0: queue: two.patch added | ||||
$ hg -R .hg/patches tlog | ||||
Phil Cohen
|
r35386 | 0: d7553909353d queue: two.patch added | ||
Adrian Buehlmann
|
r12324 | |||
$ hg qseries | ||||
two.patch | ||||
$ cd .. | ||||
Clone base again: | ||||
$ hg clone base copy2 | ||||
updating to branch default | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd copy2 | ||||
$ hg qinit -c | ||||
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 | ||||
Boris Feld
|
r39516 | new changesets d7553909353d (1 drafts) | ||
Adrian Buehlmann
|
r12324 | merging series | ||
2 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||||
$ hg -R .hg/patches theads | ||||
0: queue: two.patch added | ||||
$ hg -R .hg/patches tlog | ||||
Phil Cohen
|
r35386 | 0: d7553909353d queue: two.patch added | ||
Adrian Buehlmann
|
r12324 | |||
$ hg qseries | ||||
two.patch | ||||
$ cd .. | ||||