##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: remove 'hghave symlink' from test-import-git.t...
tests: remove 'hghave symlink' from test-import-git.t The test had a long chain of commits depending on execbits in some of first commits. The hashes are checked throughout the file, so there was no elegant way to make it pass both with and without execbits. We now rollback the execbits-or-not commits and make a stable change instead. The hash chain is thus updated once but is now a bit more stable. The test coverage should be unaltered.
Klaus Koch - - Load All Authors

File last commit:

r12962:ff083040 stable
r16910:ad229181 default
Show More
test-mq-pull-from-bundle.t
135 lines | 2.7 KiB | text/troff | Tads3Lexer
/ tests / test-mq-pull-from-bundle.t
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
tests: unify some of test-mq*
 r12324 $ cat <<EOF >> $HGRCPATH
> [extensions]
> mq=
> [alias]
> tlog = log --template "{rev}: {desc}\\n"
> 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
bundlerepository: get rid of temporary bundle files (issue2478)...
 r12962 $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true
Adrian Buehlmann
tests: unify some of test-mq*
 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
bundlerepository: get rid of temporary bundle files (issue2478)...
 r12962 $ test -f ./fresh/.hg/hg-bundle* && echo 'temp. bundle file remained' || true
Adrian Buehlmann
tests: unify some of test-mq*
 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
bundlerepository: get rid of temporary bundle files (issue2478)...
 r12962 $ test -f .hg/hg-bundle* && echo 'temp. bundle file remained' || true
Adrian Buehlmann
tests: unify some of test-mq*
 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
merging series
2 files updated, 1 files merged, 0 files removed, 0 files unresolved
Klaus Koch
bundlerepository: get rid of temporary bundle files (issue2478)...
 r12962 $ test -f .hg/patches/hg-bundle* && echo 'temp. bundle file remained' || true
Adrian Buehlmann
tests: unify some of test-mq*
 r12324
$ hg -R .hg/patches theads
0: queue: two.patch added
$ hg -R .hg/patches tlog
0: queue: two.patch added
$ 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
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
0: queue: two.patch added
$ hg qseries
two.patch
$ cd ..