Mercurial > hg
view tests/test-issue4074.t @ 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 | f1ca249696ed |
children | 75be14993fda |
line wrap: on
line source
#require no-pure A script to generate nasty diff worst-case scenarios: $ cat > s.py <<EOF > import random > for x in xrange(100000): > print > if random.randint(0, 100) >= 50: > x += 1 > print hex(x) > EOF $ hg init a $ cd a Check in a big file: $ python ../s.py > a $ hg ci -qAm0 Modify it: $ python ../s.py > a Time a check-in, should never take more than 10 seconds user time: $ hg ci --time -m1 time: real .* secs .user [0-9][.].* sys .* (re)