Mercurial > hg
annotate tests/bzr-definitions @ 27746:f0e9f38d250f
rebase: prevent creating divergence
Before this patch rebase would create divergence when you were rebasing obsolete
changesets on a destination not containing one of its successors.
This patch introduces rebase.allowdivergence to explicitly allow
divergence creation with rebase.
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Tue, 12 Jan 2016 13:43:41 -0800 |
parents | 89872688893f |
children | 7a88643bc0ef |
rev | line source |
---|---|
7053 | 1 # this file holds the definitions that are used in various bzr tests |
2 | |
9042
95046688f80f
tests: remove more instances of export FOO=bar bashism
Brodie Rao <me+hg@dackz.net>
parents:
8523
diff
changeset
|
3 TERM=dumb; export TERM |
7053 | 4 echo '[extensions]' >> $HGRCPATH |
5 echo 'convert = ' >> $HGRCPATH | |
6 | |
7 glog() | |
8 { | |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
16060
diff
changeset
|
9 hg log -G --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@" |
7053 | 10 } |
11 | |
12 manifest() | |
13 { | |
14 echo "% manifest of $2" | |
15 hg -R $1 manifest -v -r $2 | |
16 } |