Mercurial > hg
annotate tests/bzr-definitions @ 14732:e9ed3506f066 stable
backout of d04ba50e104d: allow to qpop/push with a dirty working copy
The new behavior was breaking existing tools that relied on a sequence such as
this:
1) start with a dirty working copy
2) qimport some patch
3) try to qpush it
4) old behavior would fail at this point due to outstanding changes.
(new behavior would only fail if the outstanding changes and the patches
changes intersect)
5) innocent user qrefreshes, gets his local changes in the imported patch
It's worth considering if we can move this behavior to -f in the future.
author | Idan Kamara <idankk86@gmail.com> |
---|---|
date | Fri, 24 Jun 2011 23:25:42 +0300 |
parents | 95046688f80f |
children | f84dda152a55 |
rev | line source |
---|---|
7053 | 1 # this file holds the definitions that are used in various bzr tests |
2 | |
3 "$TESTDIR/hghave" bzr || exit 80 | |
4 | |
9042
95046688f80f
tests: remove more instances of export FOO=bar bashism
Brodie Rao <me+hg@dackz.net>
parents:
8523
diff
changeset
|
5 TERM=dumb; export TERM |
7053 | 6 echo '[extensions]' >> $HGRCPATH |
7 echo 'convert = ' >> $HGRCPATH | |
8 echo 'hgext.graphlog = ' >> $HGRCPATH | |
9 | |
10 glog() | |
11 { | |
8523
5b7da468531b
tests: replace #...# syntax with {...}
Martin Geisler <mg@lazybytes.net>
parents:
8211
diff
changeset
|
12 hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" |
7053 | 13 } |
14 | |
15 manifest() | |
16 { | |
17 echo "% manifest of $2" | |
18 hg -R $1 manifest -v -r $2 | |
19 } |