Mercurial > hg
annotate tests/bzr-definitions @ 29774:a7f8939641aa
merge: use labels in prompts to the user
Now that we persist the labels, we can consistently use the labels in
prompts for the user without risk of confusion. This changes a huge amount
of command output:
This means that merge prompts like:
no tool found to merge a
keep (l)ocal, take (o)ther, or leave (u)nresolved? u
and
remote changed a which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
become:
no tool found to merge a
keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved? u
and
remote [source] changed a which local [dest] deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
where "working copy" and "destination" were supplied by the command that
requested the merge as labels for conflict markers, and thus should be
human-friendly.
author | Simon Farnsworth <simonfar@fb.com> |
---|---|
date | Fri, 12 Aug 2016 06:01:42 -0700 |
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 } |