##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r15615:41885892 stable
r15623:fc8c7a5c merge default
Show More
test-impexp-branch.t
57 lines | 1.3 KiB | text/troff | Tads3Lexer
/ tests / test-impexp-branch.t
Nicolas Dumazet
tests: unify test-impexp-branch
r12119 $ cat >findbranch.py <<EOF
> import re, sys
>
> head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$')
>
> for line in sys.stdin:
> hmatch = head_re.match(line)
> if not hmatch:
> sys.exit(1)
> if hmatch.group(1) == 'Branch':
> sys.exit(0)
> sys.exit(1)
> EOF
Nicolas Dumazet
tests: export patches only once in test-impexp-branch
r14126
Nicolas Dumazet
tests: unify test-impexp-branch
r12119 $ hg init a
$ cd a
$ echo "Rev 1" >rev
$ hg add rev
$ hg commit -m "No branch."
$ hg branch abranch
marked working directory as branch abranch
Matt Mackall
branch: warn on branching
r15615 (branches are permanent and global, did you want a bookmark?)
Nicolas Dumazet
tests: unify test-impexp-branch
r12119 $ echo "Rev 2" >rev
$ hg commit -m "With branch."
Nicolas Dumazet
tests: export patches only once in test-impexp-branch
r14126
$ hg export 0 > ../r0.patch
$ hg export 1 > ../r1.patch
$ cd ..
$ if python findbranch.py < r0.patch; then
Nicolas Dumazet
tests: unify test-impexp-branch
r12119 > echo "Export of default branch revision has Branch header" 1>&2
> exit 1
> fi
Nicolas Dumazet
tests: export patches only once in test-impexp-branch
r14126
$ if python findbranch.py < r1.patch; then
Nicolas Dumazet
tests: unify test-impexp-branch
r12119 > : # Do nothing
> else
> echo "Export of branch revision is missing Branch header" 1>&2
> exit 1
> fi
Make sure import still works with branch information in patches.
$ hg init b
$ cd b
Nicolas Dumazet
tests: export patches only once in test-impexp-branch
r14126 $ hg import ../r0.patch
applying ../r0.patch
$ hg import ../r1.patch
applying ../r1.patch
Nicolas Dumazet
tests: unify test-impexp-branch
r12119 $ cd ..
Nicolas Dumazet
tests: export patches only once in test-impexp-branch
r14126
$ hg init c
$ cd c
$ hg import --exact ../r0.patch
applying ../r0.patch
$ hg import --exact ../r1.patch
applying ../r1.patch