( )⚙ D6562 filemerge: make last line of prompts <40 english chars (issue6158)

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6562

filemerge: make last line of prompts <40 english chars (issue6158)
ClosedPublic

Authored by spectral on Jun 20 2019, 6:09 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4764e8436b2a: filemerge: make last line of prompts <40 english chars (issue6158)
Summary

I've chosen <40 as the target so that other languages that may have a 2x blowup
in character count can still have a chance to fit into an 80 column screen.

Previously, we would show a prompt like:

keep (l)ocal [dest], take (o)ther [source], or leave (u)nresolved for some/potentially/really/long/path?

On at least some systems, if readline was in use then the last line of the
prompt would be wrapped strangely if it couldn't fit entirely on one line. This
strange wrapping may be just a carriage return without a line feed, overwriting
the beginning of the line; example (100 columns wide, 65 character filename, and
yes there's 10 spaces on the end, I assume this is to handle the user inputting
longest word we provide as an option, "unresolved"):

ng/dir/name/that/does/not/work/well/with/readline/file.txt? ave (u)nresolved for some/lon

In some cases it may partially wrap onto the next line, but still be missing
earlier parts in the line, such as below (60 columns wide, 65 character
filename):

 rev], or leave (u)nresolved for some/long/dir/name/that/do
s/not/work/well/with/readline/file.txt?

With this fix, this looks like this on a 60 column screen:

tool vim_with_markers (for pattern some/long/dir/name/that/d
oes/not/work/well/with/readline/file.txt) can't handle binar
y
tool meld can't handle binary
tool vim_with_markers can't handle binary
tool internal:merge3 can't handle binary
tool merge can't handle binary
no tool found to merge some/long/dir/name/that/does/not/work
/well/with/readline/file.txt
file 'some/long/dir/name/that/does/not/work/well/with/readli
ne/file.txt' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev
], or leave (u)nresolved.
What do you want to do?

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Jun 20 2019, 6:09 PM
durin42 added a subscriber: durin42.Jun 24 2019, 2:54 PM

I like this, but could I get you to add a patch 3 that introduces a develwarn for this?

spectral added a comment.Jun 24 2019, 7:30 PM
In D6562#95775, @durin42 wrote:

I like this, but could I get you to add a patch 3 that introduces a develwarn for this?

Done, and it found a couple other cases, but I'm not sure I like it (D6573) - non-English users might not be able to enable the devel warnings without getting a bunch of spam. I believe by the time we get to ui.prompt() we've already done the _() translation and it's in the target language? Do we have any idea if anyone enables developer warnings outside of tests (which would typically be written in English, at least for core).

Unfortunately, I don't think it's something we could put in check-style.py either... we won't know that these are going to a prompt. Anyway, we can continue discussion on this on D6573.

spectral added a comment.Jun 24 2019, 7:31 PM

Ah, a question: should this be lowercasing the first character of things? I think I copied this from somewhere where it did have an uppercase letter, but I wasn't consistent in my application of the leading uppercase letter.

durin42 added a comment.Jun 28 2019, 4:08 PM
In D6562#95823, @spectral wrote:
In D6562#95775, @durin42 wrote:

I like this, but could I get you to add a patch 3 that introduces a develwarn for this?

Done, and it found a couple other cases, but I'm not sure I like it (D6573) - non-English users might not be able to enable the devel warnings without getting a bunch of spam. I believe by the time we get to ui.prompt() we've already done the _() translation and it's in the target language? Do we have any idea if anyone enables developer warnings outside of tests (which would typically be written in English, at least for core).
Unfortunately, I don't think it's something we could put in check-style.py either... we won't know that these are going to a prompt. Anyway, we can continue discussion on this on D6573.

Oh. Yeah, good point.

Welp. I guess the best bet is to not land that last patch then. :(

spectral added a commit: rHG4764e8436b2a: filemerge: make last line of prompts <40 english chars (issue6158).Jul 8 2019, 1:06 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG4764e8436b2a: filemerge: make last line of prompts <40 english chars (issue6158) (authored by spectral). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 15795

mercurial/filemerge.py

internaltool = registrar.internalmerge() internaltool = registrar.internalmerge()
# internal tool merge types # internal tool merge types
nomerge = internaltool.nomerge nomerge = internaltool.nomerge
mergeonly = internaltool.mergeonly # just the full merge, no premerge mergeonly = internaltool.mergeonly # just the full merge, no premerge
fullmerge = internaltool.fullmerge # both premerge and merge fullmerge = internaltool.fullmerge # both premerge and merge
# IMPORTANT: keep the last line of this prompt very short ("What do you want to
# do?") because of issue6158, ideally to <40 English characters (to allow other
# languages that may take more columns to still have a chance to fit in an
# 80-column screen).
_localchangedotherdeletedmsg = _( _localchangedotherdeletedmsg = _(
"file '%(fd)s' was deleted in other%(o)s but was modified in local%(l)s.\n" "file '%(fd)s' was deleted in other%(o)s but was modified in local%(l)s.\n"
"What do you want to do?\n" "You can use (c)hanged version, (d)elete, or leave (u)nresolved.\n"
"use (c)hanged version, (d)elete, or leave (u)nresolved?" "What do you want to do?"
"$$ &Changed $$ &Delete $$ &Unresolved") "$$ &Changed $$ &Delete $$ &Unresolved")
_otherchangedlocaldeletedmsg = _( _otherchangedlocaldeletedmsg = _(
"file '%(fd)s' was deleted in local%(l)s but was modified in other%(o)s.\n" "file '%(fd)s' was deleted in local%(l)s but was modified in other%(o)s.\n"
"What do you want to do?\n" "You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.\n"
"use (c)hanged version, leave (d)eleted, or " "What do you want to do?"
"leave (u)nresolved?"
"$$ &Changed $$ &Deleted $$ &Unresolved") "$$ &Changed $$ &Deleted $$ &Unresolved")
class absentfilectx(object): class absentfilectx(object):
"""Represents a file that's ostensibly in a context but is actually not """Represents a file that's ostensibly in a context but is actually not
present in it. present in it.
This is here because it's very specific to the filemerge code for now -- This is here because it's very specific to the filemerge code for now --
other code is likely going to break with the values this returns.""" other code is likely going to break with the values this returns."""
index = ui.promptchoice( index = ui.promptchoice(
_localchangedotherdeletedmsg % prompts, 2) _localchangedotherdeletedmsg % prompts, 2)
choice = ['local', 'other', 'unresolved'][index] choice = ['local', 'other', 'unresolved'][index]
elif fcd.isabsent(): elif fcd.isabsent():
index = ui.promptchoice( index = ui.promptchoice(
_otherchangedlocaldeletedmsg % prompts, 2) _otherchangedlocaldeletedmsg % prompts, 2)
choice = ['other', 'local', 'unresolved'][index] choice = ['other', 'local', 'unresolved'][index]
else: else:
# IMPORTANT: keep the last line of this prompt ("What do you want to
# do?") very short, see comment next to _localchangedotherdeletedmsg
# at the top of the file for details.
index = ui.promptchoice( index = ui.promptchoice(
_("keep (l)ocal%(l)s, take (o)ther%(o)s, or leave (u)nresolved" _("file '%(fd)s' needs to be resolved.\n"
" for %(fd)s?" "You can keep (l)ocal%(l)s, take (o)ther%(o)s, or leave "
"(u)nresolved.\n"
"What do you want to do?"
"$$ &Local $$ &Other $$ &Unresolved") % prompts, 2) "$$ &Local $$ &Other $$ &Unresolved") % prompts, 2)
choice = ['local', 'other', 'unresolved'][index] choice = ['local', 'other', 'unresolved'][index]
if choice == 'other': if choice == 'other':
return _iother(repo, mynode, orig, fcd, fco, fca, toolconf, return _iother(repo, mynode, orig, fcd, fco, fca, toolconf,
labels) labels)
elif choice == 'local': elif choice == 'local':
return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf, return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf,

tests/test-commit-amend.t

$ hg debugrename aaa $ hg debugrename aaa
aaa renamed from aa:37d9b5d994eab34eda9c16b195ace52c7b129980 aaa renamed from aa:37d9b5d994eab34eda9c16b195ace52c7b129980
Update to p1 with 'aaa' modified. 'aaa' was renamed from 'aa' in p2. 'aa' exists Update to p1 with 'aaa' modified. 'aaa' was renamed from 'aa' in p2. 'aa' exists
in p1 too, but it was recorded as copied from p2. in p1 too, but it was recorded as copied from p2.
$ echo modified >> aaa $ echo modified >> aaa
$ hg co -m '.^' -t :merge3 $ hg co -m '.^' -t :merge3
file 'aaa' was deleted in other [destination] but was modified in local [working copy]. file 'aaa' was deleted in other [destination] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
1 files updated, 0 files merged, 1 files removed, 1 files unresolved 1 files updated, 0 files merged, 1 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
[1] [1]
$ hg co -C tip $ hg co -C tip
2 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg mv aaa aa $ hg mv aaa aa
$ hg ci --amend -m 'merge bar again (undo rename)' $ hg ci --amend -m 'merge bar again (undo rename)'
$ hg ci -m 'rm aa' $ hg ci -m 'rm aa'
$ hg up -q default $ hg up -q default
$ echo aa >> aa $ echo aa >> aa
$ hg ci -m aa $ hg ci -m aa
$ hg merge -q bar --config ui.interactive=True << EOF $ hg merge -q bar --config ui.interactive=True << EOF
> c > c
> EOF > EOF
file 'aa' was deleted in other [merge rev] but was modified in local [working copy]. file 'aa' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? c What do you want to do? c
$ hg ci -m 'merge bar (with conflicts)' $ hg ci -m 'merge bar (with conflicts)'
$ hg log --config diff.git=1 -pr . $ hg log --config diff.git=1 -pr .
changeset: 28:b4c3035e2544 changeset: 28:b4c3035e2544
tag: tip tag: tip
parent: 27:4b216ca5ba97 parent: 27:4b216ca5ba97
parent: 26:67db8847a540 parent: 26:67db8847a540
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000

tests/test-copy-move-merge.t

2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg
$ hg up -qC 2 $ hg up -qC 2
$ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.copytrace=off --config ui.interactive=True << EOF $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.copytrace=off --config ui.interactive=True << EOF
> c > c
> EOF > EOF
rebasing 2:add3f11052fa "other" (tip) rebasing 2:add3f11052fa "other" (tip)
file 'a' was deleted in local [dest] but was modified in other [source]. file 'a' was deleted in local [dest] but was modified in other [source].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c What do you want to do? c
$ cat b $ cat b
1 1
2 2
$ cd .. $ cd ..
Verify disabling copy tracing still keeps copies from rebase source Verify disabling copy tracing still keeps copies from rebase source

tests/test-copytrace-heuristics.t

| o rev: 1 | o rev: 1
|/ desc: rm a, add b |/ desc: rm a, add b
o rev: 0 o rev: 0
desc: initial desc: initial
$ hg rebase -s . -d 1 $ hg rebase -s . -d 1
rebasing 2:d526312210b9 "mode a" (tip) rebasing 2:d526312210b9 "mode a" (tip)
file 'a' was deleted in local [dest] but was modified in other [source]. file 'a' was deleted in local [dest] but was modified in other [source].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo
Test when lca didn't modified the file that was moved Test when lca didn't modified the file that was moved
----------------------------------------------------- -----------------------------------------------------
desc: initial desc: initial
With small limit With small limit
$ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0 $ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0
rebasing 2:ef716627c70b "mod a" (tip) rebasing 2:ef716627c70b "mod a" (tip)
skipping copytracing for 'a', more candidates than the limit: 7 skipping copytracing for 'a', more candidates than the limit: 7
file 'a' was deleted in local [dest] but was modified in other [source]. file 'a' was deleted in local [dest] but was modified in other [source].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
With default limit which is 100 With default limit which is 100
o rev: 0, phase: draft o rev: 0, phase: draft
desc: added a desc: added a
When the sourcecommitlimit is small and we have more drafts, we use heuristics only When the sourcecommitlimit is small and we have more drafts, we use heuristics only
$ hg rebase -s 1 -d . $ hg rebase -s 1 -d .
rebasing 1:8b6e13696c38 "added more things to a" rebasing 1:8b6e13696c38 "added more things to a"
file 'a' was deleted in local [dest] but was modified in other [source]. file 'a' was deleted in local [dest] but was modified in other [source].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
But when we have "sourcecommitlimit > (no. of drafts from base to c1)", we do But when we have "sourcecommitlimit > (no. of drafts from base to c1)", we do
fullcopytracing fullcopytracing
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
$ hg rebase -s 1 -d . --config experimental.copytrace.sourcecommitlimit=100 $ hg rebase -s 1 -d . --config experimental.copytrace.sourcecommitlimit=100
rebasing 1:8b6e13696c38 "added more things to a" rebasing 1:8b6e13696c38 "added more things to a"
merging foo/bar and a to foo/bar merging foo/bar and a to foo/bar
saved backup bundle to $TESTTMP/repo/repo/repo/.hg/strip-backup/8b6e13696c38-fc14ac83-rebase.hg saved backup bundle to $TESTTMP/repo/repo/repo/.hg/strip-backup/8b6e13696c38-fc14ac83-rebase.hg
$ cd .. $ cd ..
$ rm -rf repo $ rm -rf repo

tests/test-largefiles-update.t

(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue --config ui.interactive=True <<EOF $ hg rebase --continue --config ui.interactive=True <<EOF
> c > c
> EOF > EOF
rebasing 1:72518492caa6 "#1" rebasing 1:72518492caa6 "#1"
rebasing 4:07d6153b5c04 "#4" rebasing 4:07d6153b5c04 "#4"
file '.hglf/large1' was deleted in other [source] but was modified in local [dest]. file '.hglf/large1' was deleted in other [source] but was modified in local [dest].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? c What do you want to do? c
$ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]' $ hg diff -c "tip~1" --nodates .hglf/large1 | grep '^[+-][0-9a-z]'
-e5bb990443d6a92aaf7223813720f7566c9dd05b -e5bb990443d6a92aaf7223813720f7566c9dd05b
+8a4f783556e7dea21139ca0466eafce954c75c13 +8a4f783556e7dea21139ca0466eafce954c75c13
$ rm -f large1 $ rm -f large1
$ hg update -q -C tip $ hg update -q -C tip
$ cat large1 $ cat large1
manually modified before 'hg rebase --continue' manually modified before 'hg rebase --continue'

tests/test-lfconvert.t

$ hg commit -A -m"add normal3, modify sub/*" $ hg commit -A -m"add normal3, modify sub/*"
adding normal3 adding normal3
created new head created new head
$ hg rm large normal3 $ hg rm large normal3
$ hg commit -q -m"remove large, normal3" $ hg commit -q -m"remove large, normal3"
$ hg merge $ hg merge
tool internal:merge (for pattern stuff/maybelarge.dat) can't handle binary tool internal:merge (for pattern stuff/maybelarge.dat) can't handle binary
no tool found to merge stuff/maybelarge.dat no tool found to merge stuff/maybelarge.dat
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for stuff/maybelarge.dat? u file 'stuff/maybelarge.dat' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
merging sub/normal2 and stuff/normal2 to stuff/normal2 merging sub/normal2 and stuff/normal2 to stuff/normal2
0 files updated, 1 files merged, 0 files removed, 1 files unresolved 0 files updated, 1 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat
$ hg resolve -m stuff/maybelarge.dat $ hg resolve -m stuff/maybelarge.dat
(no more unresolved files) (no more unresolved files)
$ hg commit -m"merge" $ hg commit -m"merge"

tests/test-merge-changedelete.t

$ hg ci -m 'changed file1, removed file2, changed file3' $ hg ci -m 'changed file1, removed file2, changed file3'
created new head created new head
Non-interactive merge: Non-interactive merge:
$ hg merge -y $ hg merge -y
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
merging file3 merging file3
warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 3 files unresolved 0 files updated, 0 files merged, 0 files removed, 3 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ status $ status
--- status --- --- status ---
updated to "13910f48cf7b: changed file1, removed file2, changed file3" updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default" 1 other heads for branch "default"
$ hg merge --config ui.interactive=true <<EOF $ hg merge --config ui.interactive=true <<EOF
> c > c
> d > d
> EOF > EOF
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? c What do you want to do? c
file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d What do you want to do? d
merging file3 merging file3
warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
0 files updated, 2 files merged, 0 files removed, 1 files unresolved 0 files updated, 2 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ status $ status
--- status --- --- status ---
$ hg merge --config ui.interactive=true <<EOF $ hg merge --config ui.interactive=true <<EOF
> foo > foo
> bar > bar
> d > d
> baz > baz
> c > c
> EOF > EOF
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? foo What do you want to do? foo
unrecognized response unrecognized response
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? bar What do you want to do? bar
unrecognized response unrecognized response
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? d What do you want to do? d
file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? baz What do you want to do? baz
unrecognized response unrecognized response
file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c What do you want to do? c
merging file3 merging file3
warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
0 files updated, 1 files merged, 1 files removed, 1 files unresolved 0 files updated, 1 files merged, 1 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ status $ status
--- status --- --- status ---
2 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to "13910f48cf7b: changed file1, removed file2, changed file3" updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default" 1 other heads for branch "default"
$ hg merge --config ui.interactive=true <<EOF $ hg merge --config ui.interactive=true <<EOF
> d > d
> EOF > EOF
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? d What do you want to do? d
file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
merging file3 merging file3
warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 1 files removed, 2 files unresolved 0 files updated, 0 files merged, 1 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ status $ status
--- status --- --- status ---
$ hg co -C $ hg co -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to "13910f48cf7b: changed file1, removed file2, changed file3" updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default" 1 other heads for branch "default"
$ hg merge --config ui.interactive=True --tool :prompt $ hg merge --config ui.interactive=True --tool :prompt
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
file 'file3' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
0 files updated, 0 files merged, 0 files removed, 3 files unresolved 0 files updated, 0 files merged, 0 files removed, 3 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ status 2>&1 | tee $TESTTMP/prompt.status $ status 2>&1 | tee $TESTTMP/prompt.status
--- status --- --- status ---
M file2 M file2
M file3 M file3
C file1 C file1
$ hg co -C $ hg co -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to "13910f48cf7b: changed file1, removed file2, changed file3" updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default" 1 other heads for branch "default"
$ hg merge --tool :prompt $ hg merge --tool :prompt
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? u file 'file3' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 3 files unresolved 0 files updated, 0 files merged, 0 files removed, 3 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ status $ status
--- status --- --- status ---
M file2 M file2
M file3 M file3
C file1 C file1
$ hg co -C $ hg co -C
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
updated to "13910f48cf7b: changed file1, removed file2, changed file3" updated to "13910f48cf7b: changed file1, removed file2, changed file3"
1 other heads for branch "default" 1 other heads for branch "default"
$ hg merge --tool :merge3 $ hg merge --tool :merge3
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
merging file3 merging file3
warning: conflicts while merging file3! (edit, then use 'hg resolve --mark') warning: conflicts while merging file3! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 3 files unresolved 0 files updated, 0 files merged, 0 files removed, 3 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ status $ status
--- status --- --- status ---
M file2 M file2
=== :local -> :other === === :local -> :other ===
(no more unresolved files) (no more unresolved files)
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :other -> :prompt === === :other -> :prompt ===
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
file 'file3' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :prompt -> :local === === :prompt -> :local ===
(no more unresolved files) (no more unresolved files)
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :local -> :fail === === :local -> :fail ===
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :fail -> :other === === :fail -> :other ===
(no more unresolved files) (no more unresolved files)
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :other -> :local === === :other -> :local ===
(no more unresolved files) (no more unresolved files)
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :local -> :prompt === === :local -> :prompt ===
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
file 'file3' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :prompt -> :other === === :prompt -> :other ===
(no more unresolved files) (no more unresolved files)
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :other -> :fail === === :other -> :fail ===
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :fail -> :prompt === === :fail -> :prompt ===
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
file 'file2' was deleted in local [working copy] but was modified in other [merge rev]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do?
file 'file3' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3?
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :prompt -> :fail === === :prompt -> :fail ===
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :fail -> :local === === :fail -> :local ===
(no more unresolved files) (no more unresolved files)
--- diff of status --- --- diff of status ---
(status identical) (status identical)
Non-interactive linear update Non-interactive linear update
$ hg co -C 0 $ hg co -C 0
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo changed >> file1 $ echo changed >> file1
$ hg rm file2 $ hg rm file2
$ hg update 1 -y $ hg update 1 -y
file 'file1' was deleted in other [destination] but was modified in local [working copy]. file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
file 'file2' was deleted in local [working copy] but was modified in other [destination]. file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
1 files updated, 0 files merged, 0 files removed, 2 files unresolved 1 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
[1] [1]
$ status $ status
--- status --- --- status ---
A file1 A file1
C file2 C file2
C file3 C file3
Force prompts with no input Force prompts with no input
$ hg co -C 0 $ hg co -C 0
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo changed >> file1 $ echo changed >> file1
$ hg rm file2 $ hg rm file2
$ hg update 1 --config ui.interactive=True --tool :prompt $ hg update 1 --config ui.interactive=True --tool :prompt
file 'file1' was deleted in other [destination] but was modified in local [working copy]. file 'file1' was deleted in other [destination] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
file 'file2' was deleted in local [working copy] but was modified in other [destination]. file 'file2' was deleted in local [working copy] but was modified in other [destination].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
1 files updated, 0 files merged, 0 files removed, 2 files unresolved 1 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
[1] [1]
$ status 2>&1 | tee $TESTTMP/prompt.status $ status 2>&1 | tee $TESTTMP/prompt.status
--- status --- --- status ---
A file1 A file1
C file2 C file2
C file3 C file3
Choose to merge all files Choose to merge all files
$ hg co -C 0 $ hg co -C 0
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo changed >> file1 $ echo changed >> file1
$ hg rm file2 $ hg rm file2
$ hg update 1 --tool :merge3 $ hg update 1 --tool :merge3
file 'file1' was deleted in other [destination] but was modified in local [working copy]. file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
file 'file2' was deleted in local [working copy] but was modified in other [destination]. file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
1 files updated, 0 files merged, 0 files removed, 2 files unresolved 1 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
[1] [1]
$ status $ status
--- status --- --- status ---
A file1 A file1
C file2 C file2
C file3 C file3
=== :local -> :other === === :local -> :other ===
(no more unresolved files) (no more unresolved files)
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :other -> :prompt === === :other -> :prompt ===
file 'file1' was deleted in other [destination] but was modified in local [working copy]. file 'file1' was deleted in other [destination] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
file 'file2' was deleted in local [working copy] but was modified in other [destination]. file 'file2' was deleted in local [working copy] but was modified in other [destination].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :prompt -> :local === === :prompt -> :local ===
(no more unresolved files) (no more unresolved files)
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :local -> :fail === === :local -> :fail ===
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :fail -> :other === === :fail -> :other ===
(no more unresolved files) (no more unresolved files)
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :other -> :local === === :other -> :local ===
(no more unresolved files) (no more unresolved files)
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :local -> :prompt === === :local -> :prompt ===
file 'file1' was deleted in other [destination] but was modified in local [working copy]. file 'file1' was deleted in other [destination] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
file 'file2' was deleted in local [working copy] but was modified in other [destination]. file 'file2' was deleted in local [working copy] but was modified in other [destination].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :prompt -> :other === === :prompt -> :other ===
(no more unresolved files) (no more unresolved files)
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :other -> :fail === === :other -> :fail ===
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :fail -> :prompt === === :fail -> :prompt ===
file 'file1' was deleted in other [destination] but was modified in local [working copy]. file 'file1' was deleted in other [destination] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved?
file 'file2' was deleted in local [working copy] but was modified in other [destination]. file 'file2' was deleted in local [working copy] but was modified in other [destination].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved?
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :prompt -> :fail === === :prompt -> :fail ===
--- diff of status --- --- diff of status ---
(status identical) (status identical)
=== :fail -> :local === === :fail -> :local ===
(no more unresolved files) (no more unresolved files)
--- diff of status --- --- diff of status ---
(status identical) (status identical)

tests/test-merge-force.t

Merge with remote Merge with remote
# Notes: # Notes:
# - local and remote changed content1_content2_*_content2-untracked # - local and remote changed content1_content2_*_content2-untracked
# in the same way, so it could potentially be left alone # in the same way, so it could potentially be left alone
$ hg merge -f --tool internal:merge3 'desc("remote")' 2>&1 | tee $TESTTMP/merge-output-1 $ hg merge -f --tool internal:merge3 'desc("remote")' 2>&1 | tee $TESTTMP/merge-output-1
file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy]. file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
merging content1_content2_content1_content4-tracked merging content1_content2_content1_content4-tracked
merging content1_content2_content2_content1-tracked merging content1_content2_content2_content1-tracked
merging content1_content2_content2_content4-tracked merging content1_content2_content2_content4-tracked
merging content1_content2_content3_content1-tracked merging content1_content2_content3_content1-tracked
merging content1_content2_content3_content3-tracked merging content1_content2_content3_content3-tracked
merging content1_content2_content3_content4-tracked merging content1_content2_content3_content4-tracked
merging content1_content2_missing_content1-tracked merging content1_content2_missing_content1-tracked
merging content1_content2_missing_content4-tracked merging content1_content2_missing_content4-tracked
Re-resolve and check status Re-resolve and check status
$ hg resolve --unmark --all $ hg resolve --unmark --all
$ hg resolve --all --tool :local $ hg resolve --all --tool :local
(no more unresolved files) (no more unresolved files)
$ hg resolve --unmark --all $ hg resolve --unmark --all
$ hg resolve --all --tool internal:merge3 $ hg resolve --all --tool internal:merge3
file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
merging content1_content2_content1_content4-tracked merging content1_content2_content1_content4-tracked
file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
merging content1_content2_content2_content1-tracked merging content1_content2_content2_content1-tracked
file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
merging content1_content2_content2_content4-tracked merging content1_content2_content2_content4-tracked
file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
merging content1_content2_content3_content1-tracked merging content1_content2_content3_content1-tracked
file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
merging content1_content2_content3_content3-tracked merging content1_content2_content3_content3-tracked
file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
merging content1_content2_content3_content4-tracked merging content1_content2_content3_content4-tracked
file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
merging content1_content2_missing_content1-tracked merging content1_content2_missing_content1-tracked
file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
merging content1_content2_missing_content4-tracked merging content1_content2_missing_content4-tracked
file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev]. file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy]. file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy]. file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
merging missing_content2_content2_content4-tracked merging missing_content2_content2_content4-tracked
merging missing_content2_content3_content3-tracked merging missing_content2_content3_content3-tracked
merging missing_content2_content3_content4-tracked merging missing_content2_content3_content4-tracked
merging missing_content2_missing_content4-tracked merging missing_content2_missing_content4-tracked
merging missing_content2_missing_content4-untracked merging missing_content2_missing_content4-untracked
warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark') warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark') warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark') warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')

tests/test-merge-remove.t

[255] [255]
$ cat bar $ cat bar
memories of buried pirate treasure memories of buried pirate treasure
Those who use force will lose Those who use force will lose
$ hg merge -f $ hg merge -f
file 'bar' was deleted in local [working copy] but was modified in other [merge rev]. file 'bar' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
merging foo1 and foo to foo1 merging foo1 and foo to foo1
0 files updated, 1 files merged, 0 files removed, 1 files unresolved 0 files updated, 1 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ cat bar $ cat bar
bleh bleh
$ hg st $ hg st
M bar M bar
M foo1 M foo1

tests/test-merge-subrepos.t

$ hg up -r '.^' --check $ hg up -r '.^' --check
abort: uncommitted changes in subrepository "subrepo" abort: uncommitted changes in subrepository "subrepo"
[255] [255]
$ hg up -r '.^' --config ui.interactive=True << EOF $ hg up -r '.^' --config ui.interactive=True << EOF
> d > d
> EOF > EOF
file 'b' was deleted in local [working copy] but was modified in other [destination]. file 'b' was deleted in local [working copy] but was modified in other [destination].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d What do you want to do? d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
XXX: There's a difference between wdir() and '.', so there should be a status. XXX: There's a difference between wdir() and '.', so there should be a status.
`hg files -S` from the top is also missing 'subrepo/b'. `hg files -S` from the top is also missing 'subrepo/b'.
$ hg st -S $ hg st -S
$ hg st -R subrepo $ hg st -R subrepo
$ hg files -R subrepo $ hg files -R subrepo

tests/test-merge-tools.t

$ beforemerge $ beforemerge
[merge-tools] [merge-tools]
false.whatever= false.whatever=
true.priority=1 true.priority=1
true.executable=cat true.executable=cat
# hg update -C 1 # hg update -C 1
$ hg merge -r 2 --config ui.merge=internal:prompt $ hg merge -r 2 --config ui.merge=internal:prompt
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u file 'f' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ aftermerge $ aftermerge
# cat f # cat f
revision 1 revision 1
space space
# hg stat # hg stat
M f M f
# hg resolve --list # hg resolve --list
U f U f
ui.merge specifies :prompt, with 'leave unresolved' chosen ui.merge specifies :prompt, with 'leave unresolved' chosen
$ beforemerge $ beforemerge
[merge-tools] [merge-tools]
false.whatever= false.whatever=
true.priority=1 true.priority=1
true.executable=cat true.executable=cat
# hg update -C 1 # hg update -C 1
$ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF $ hg merge -r 2 --config ui.merge=:prompt --config ui.interactive=True << EOF
> u > u
> EOF > EOF
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u file 'f' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ aftermerge $ aftermerge
# cat f # cat f
revision 1 revision 1
space space
# hg stat # hg stat
M f M f
# hg resolve --list # hg resolve --list
U f U f
prompt with EOF prompt with EOF
$ beforemerge $ beforemerge
[merge-tools] [merge-tools]
false.whatever= false.whatever=
true.priority=1 true.priority=1
true.executable=cat true.executable=cat
# hg update -C 1 # hg update -C 1
$ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true $ hg merge -r 2 --config ui.merge=internal:prompt --config ui.interactive=true
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? file 'f' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do?
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ aftermerge $ aftermerge
# cat f # cat f
revision 1 revision 1
space space
# hg stat # hg stat
M f M f
# hg resolve --list # hg resolve --list
U f U f
$ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? file 'f' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do?
[1] [1]
$ aftermerge $ aftermerge
# cat f # cat f
revision 1 revision 1
space space
# hg stat # hg stat
M f M f
? f.orig ? f.orig
# hg resolve --list # hg resolve --list
U f U f
$ rm f $ rm f
$ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true $ hg resolve --all --config ui.merge=internal:prompt --config ui.interactive=true
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? file 'f' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do?
[1] [1]
$ aftermerge $ aftermerge
# cat f # cat f
revision 1 revision 1
space space
# hg stat # hg stat
M f M f
# hg resolve --list # hg resolve --list
U f U f
$ hg resolve --all --config ui.merge=internal:prompt $ hg resolve --all --config ui.merge=internal:prompt
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u file 'f' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
[1] [1]
$ aftermerge $ aftermerge
# cat f # cat f
revision 1 revision 1
space space
# hg stat # hg stat
M f M f
? f.orig ? f.orig
$ hg merge 9 \ $ hg merge 9 \
> --config merge-tools.:other.binary=true \ > --config merge-tools.:other.binary=true \
> --config ui.merge=:other > --config ui.merge=:other
tool :other (for pattern b) can't handle binary tool :other (for pattern b) can't handle binary
tool true can't handle binary tool true can't handle binary
tool :other can't handle binary tool :other can't handle binary
tool false can't handle binary tool false can't handle binary
no tool found to merge b no tool found to merge b
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for b? u file 'b' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ hg merge --abort -q $ hg merge --abort -q
With merge.strict-capability-check=true, binary files capability of With merge.strict-capability-check=true, binary files capability of
internal merge tools is checked strictly. internal merge tools is checked strictly.

tests/test-merge-types.t

branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c
preserving a for resolve of a preserving a for resolve of a
a: versions differ -> m (premerge) a: versions differ -> m (premerge)
tool internal:merge (for pattern a) can't handle symlinks tool internal:merge (for pattern a) can't handle symlinks
couldn't find merge tool hgmerge couldn't find merge tool hgmerge
no tool found to merge a no tool found to merge a
picked tool ':prompt' for a (binary False symlink True changedelete False) picked tool ':prompt' for a (binary False symlink True changedelete False)
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for a? u file 'a' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ tellmeabout a $ tellmeabout a
a is a symlink: a is a symlink:
a -> symlink a -> symlink
$ hg resolve a --tool internal:other $ hg resolve a --tool internal:other
resolving manifests resolving manifests
branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False
ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f
preserving a for resolve of a preserving a for resolve of a
a: versions differ -> m (premerge) a: versions differ -> m (premerge)
(couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)
no tool found to merge a no tool found to merge a
picked tool ':prompt' for a (binary False symlink True changedelete False) picked tool ':prompt' for a (binary False symlink True changedelete False)
keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved for a? u file 'a' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved.
What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
updated to "521a1e40188f: symlink" updated to "521a1e40188f: symlink"
1 other heads for branch "default" 1 other heads for branch "default"
[1] [1]
$ hg diff --git $ hg diff --git
diff --git a/a b/a diff --git a/a b/a
old mode 120000 old mode 120000
$ hg ci -qm1 $ hg ci -qm1
$ hg up -qr0 $ hg up -qr0
$ rm f $ rm f
$ ln -s base f $ ln -s base f
$ hg ci -qm2 $ hg ci -qm2
$ hg merge $ hg merge
tool internal:merge (for pattern f) can't handle symlinks tool internal:merge (for pattern f) can't handle symlinks
no tool found to merge f no tool found to merge f
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u file 'f' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ tellmeabout f $ tellmeabout f
f is a symlink: f is a symlink:
f -> base f -> base
$ hg up -Cqr1 $ hg up -Cqr1
$ hg merge $ hg merge
tool internal:merge (for pattern f) can't handle symlinks tool internal:merge (for pattern f) can't handle symlinks
no tool found to merge f no tool found to merge f
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u file 'f' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ tellmeabout f $ tellmeabout f
f is a plain file with content: f is a plain file with content:
file file
content content
$ hg ci -qm1 $ hg ci -qm1
$ hg up -qr0 $ hg up -qr0
$ rm f $ rm f
$ ln -s dangling f $ ln -s dangling f
$ hg ci -qm2 $ hg ci -qm2
$ hg merge $ hg merge
tool internal:merge (for pattern f) can't handle symlinks tool internal:merge (for pattern f) can't handle symlinks
no tool found to merge f no tool found to merge f
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u file 'f' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ tellmeabout f $ tellmeabout f
f is a symlink: f is a symlink:
f -> dangling f -> dangling
$ hg up -Cqr1 $ hg up -Cqr1
$ hg merge $ hg merge
tool internal:merge (for pattern f) can't handle symlinks tool internal:merge (for pattern f) can't handle symlinks
no tool found to merge f no tool found to merge f
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u file 'f' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ tellmeabout f $ tellmeabout f
f is a plain file with content: f is a plain file with content:
f f
Test removed 'x' flag merged with content change - both ways Test removed 'x' flag merged with content change - both ways
$ hg merge $ hg merge
merging a merging a
warning: cannot merge flags for b without common ancestor - keeping local flags warning: cannot merge flags for b without common ancestor - keeping local flags
merging b merging b
merging bx merging bx
warning: cannot merge flags for c without common ancestor - keeping local flags warning: cannot merge flags for c without common ancestor - keeping local flags
tool internal:merge (for pattern d) can't handle symlinks tool internal:merge (for pattern d) can't handle symlinks
no tool found to merge d no tool found to merge d
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for d? u file 'd' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
tool internal:merge (for pattern f) can't handle symlinks tool internal:merge (for pattern f) can't handle symlinks
no tool found to merge f no tool found to merge f
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u file 'f' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
tool internal:merge (for pattern h) can't handle symlinks tool internal:merge (for pattern h) can't handle symlinks
no tool found to merge h no tool found to merge h
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for h? u file 'h' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
warning: conflicts while merging b! (edit, then use 'hg resolve --mark') warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
3 files updated, 0 files merged, 0 files removed, 6 files unresolved 3 files updated, 0 files merged, 0 files removed, 6 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ hg resolve -l $ hg resolve -l
U a U a
$ hg merge $ hg merge
merging a merging a
warning: cannot merge flags for b without common ancestor - keeping local flags warning: cannot merge flags for b without common ancestor - keeping local flags
merging b merging b
merging bx merging bx
warning: cannot merge flags for c without common ancestor - keeping local flags warning: cannot merge flags for c without common ancestor - keeping local flags
tool internal:merge (for pattern d) can't handle symlinks tool internal:merge (for pattern d) can't handle symlinks
no tool found to merge d no tool found to merge d
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for d? u file 'd' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
tool internal:merge (for pattern f) can't handle symlinks tool internal:merge (for pattern f) can't handle symlinks
no tool found to merge f no tool found to merge f
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u file 'f' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
tool internal:merge (for pattern h) can't handle symlinks tool internal:merge (for pattern h) can't handle symlinks
no tool found to merge h no tool found to merge h
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for h? u file 'h' needs to be resolved.
You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved.
What do you want to do? u
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
warning: conflicts while merging b! (edit, then use 'hg resolve --mark') warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') warning: conflicts while merging bx! (edit, then use 'hg resolve --mark')
3 files updated, 0 files merged, 0 files removed, 6 files unresolved 3 files updated, 0 files merged, 0 files removed, 6 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ tellmeabout a $ tellmeabout a
a is a plain file with content: a is a plain file with content:

tests/test-rebase-newancestor.t

$ hg rebase -r 'only(dev,default)' -d default --config ui.interactive=True << EOF $ hg rebase -r 'only(dev,default)' -d default --config ui.interactive=True << EOF
> c > c
> EOF > EOF
rebasing 1:1d1a643d390e "dev: create branch" rebasing 1:1d1a643d390e "dev: create branch"
note: not rebasing 1:1d1a643d390e "dev: create branch", its destination already has all its changes note: not rebasing 1:1d1a643d390e "dev: create branch", its destination already has all its changes
rebasing 2:ec2c14fb2984 "dev: f-dev stuff" rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
rebasing 4:4b019212aaf6 "dev: merge default" rebasing 4:4b019212aaf6 "dev: merge default"
file 'f-default' was deleted in local [dest] but was modified in other [source]. file 'f-default' was deleted in local [dest] but was modified in other [source].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c What do you want to do? c
rebasing 6:9455ee510502 "dev: merge default" rebasing 6:9455ee510502 "dev: merge default"
saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-rebase.hg saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-43e9e04b-rebase.hg
$ hg tglog $ hg tglog
o 6: fbc098e72227 'dev: merge default' o 6: fbc098e72227 'dev: merge default'
| |
o 5: eda7b7f46f5d 'dev: merge default' o 5: eda7b7f46f5d 'dev: merge default'
| |
o 4: 3e075b1c0a40 'dev: f-dev stuff' o 4: 3e075b1c0a40 'dev: f-dev stuff'
$ hg phase -fdr0: $ hg phase -fdr0:
$ hg rebase -r 'children(only(dev,default))' -d default --config ui.interactive=True << EOF $ hg rebase -r 'children(only(dev,default))' -d default --config ui.interactive=True << EOF
> c > c
> EOF > EOF
rebasing 2:ec2c14fb2984 "dev: f-dev stuff" rebasing 2:ec2c14fb2984 "dev: f-dev stuff"
rebasing 4:4b019212aaf6 "dev: merge default" rebasing 4:4b019212aaf6 "dev: merge default"
file 'f-default' was deleted in local [dest] but was modified in other [source]. file 'f-default' was deleted in local [dest] but was modified in other [source].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c What do you want to do? c
rebasing 6:9455ee510502 "dev: merge default" rebasing 6:9455ee510502 "dev: merge default"
saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-rebase.hg saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-62d0b222-rebase.hg
$ hg tglog $ hg tglog
o 7: fbc098e72227 'dev: merge default' o 7: fbc098e72227 'dev: merge default'
| |
o 6: eda7b7f46f5d 'dev: merge default' o 6: eda7b7f46f5d 'dev: merge default'
| |
o 5: 3e075b1c0a40 'dev: f-dev stuff' o 5: 3e075b1c0a40 'dev: f-dev stuff'

tests/test-rename-merge2.t

branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
a: prompt deleted/changed -> m (premerge) a: prompt deleted/changed -> m (premerge)
picked tool ':prompt' for a (binary False symlink False changedelete True) picked tool ':prompt' for a (binary False symlink False changedelete True)
file 'a' was deleted in local [working copy] but was modified in other [merge rev]. file 'a' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
b: both created -> m (premerge) b: both created -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b merging b
my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
preserving a for resolve of a preserving a for resolve of a
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
a: prompt changed/deleted -> m (premerge) a: prompt changed/deleted -> m (premerge)
picked tool ':prompt' for a (binary False symlink False changedelete True) picked tool ':prompt' for a (binary False symlink False changedelete True)
file 'a' was deleted in other [merge rev] but was modified in local [working copy]. file 'a' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
b: both created -> m (premerge) b: both created -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b merging b
my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
rev: versions differ -> m (premerge) rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev merging rev
my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337

tests/test-resolve.t

$ hg rm file1 $ hg rm file1
$ hg ci -qm "r2 (delete file1)" $ hg ci -qm "r2 (delete file1)"
(At this point we have r0 creating file1, and sibling commits r1 and r2, which (At this point we have r0 creating file1, and sibling commits r1 and r2, which
modify and delete file1, respectively) modify and delete file1, respectively)
$ hg merge -r 1 $ hg merge -r 1
file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ hg resolve --list $ hg resolve --list
U file1 U file1
Because we left it as 'unresolved' the file should still exist. Because we left it as 'unresolved' the file should still exist.
$ [ -f file1 ] || echo "File does not exist?" $ [ -f file1 ] || echo "File does not exist?"
BC behavior: `hg resolve --mark` accepts that the file is still there, and BC behavior: `hg resolve --mark` accepts that the file is still there, and
$ hg resolve --list $ hg resolve --list
R file1 R file1
The file is still there: The file is still there:
$ [ -f file1 ] || echo "File does not exist?" $ [ -f file1 ] || echo "File does not exist?"
Let's resolve the issue by deleting the file via `hg resolve` Let's resolve the issue by deleting the file via `hg resolve`
$ hg resolve --unmark file1 $ hg resolve --unmark file1
$ echo 'd' | hg resolve file1 --config ui.interactive=1 $ echo 'd' | hg resolve file1 --config ui.interactive=1
file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d What do you want to do? d
(no more unresolved files) (no more unresolved files)
$ hg resolve --list $ hg resolve --list
R file1 R file1
The file is deleted: The file is deleted:
$ [ -f file1 ] && echo "File still exists?" || true $ [ -f file1 ] && echo "File still exists?" || true
Doing `hg resolve --mark` doesn't break now that the file is missing: Doing `hg resolve --mark` doesn't break now that the file is missing:
$ hg resolve --mark --config commands.resolve.mark-check=abort $ hg resolve --mark --config commands.resolve.mark-check=abort
(no more unresolved files) (no more unresolved files)
$ hg resolve --mark --config commands.resolve.mark-check=warn $ hg resolve --mark --config commands.resolve.mark-check=warn
(no more unresolved files) (no more unresolved files)
Resurrect the file, and delete it outside of hg: Resurrect the file, and delete it outside of hg:
$ hg resolve --unmark file1 $ hg resolve --unmark file1
$ hg resolve file1 $ hg resolve file1
file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
[1] [1]
$ [ -f file1 ] || echo "File does not exist?" $ [ -f file1 ] || echo "File does not exist?"
$ hg resolve --list $ hg resolve --list
U file1 U file1
$ rm file1 $ rm file1
$ hg resolve --mark --config commands.resolve.mark-check=abort $ hg resolve --mark --config commands.resolve.mark-check=abort
(no more unresolved files) (no more unresolved files)
$ hg resolve --list $ hg resolve --list
R file1 R file1
$ hg resolve --unmark file1 $ hg resolve --unmark file1
$ hg resolve file1 $ hg resolve file1
file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. file 'file1' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u What do you want to do? u
[1] [1]
$ [ -f file1 ] || echo "File does not exist?" $ [ -f file1 ] || echo "File does not exist?"
$ hg resolve --list $ hg resolve --list
U file1 U file1
$ rm file1 $ rm file1
$ hg resolve --mark --config commands.resolve.mark-check=warn $ hg resolve --mark --config commands.resolve.mark-check=warn
(no more unresolved files) (no more unresolved files)
$ hg resolve --list $ hg resolve --list
R file1 R file1
For completeness, let's try that in the opposite direction (merging r2 into r1, For completeness, let's try that in the opposite direction (merging r2 into r1,
instead of r1 into r2): instead of r1 into r2):
$ hg update -qCr 1 $ hg update -qCr 1
$ hg merge -r 2 $ hg merge -r 2
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ hg resolve --list $ hg resolve --list
U file1 U file1
Because we left it as 'unresolved' the file should still exist. Because we left it as 'unresolved' the file should still exist.
$ [ -f file1 ] || echo "File does not exist?" $ [ -f file1 ] || echo "File does not exist?"
BC behavior: `hg resolve --mark` accepts that the file is still there, and BC behavior: `hg resolve --mark` accepts that the file is still there, and
$ hg resolve --list $ hg resolve --list
R file1 R file1
The file is still there: The file is still there:
$ [ -f file1 ] || echo "File does not exist?" $ [ -f file1 ] || echo "File does not exist?"
Let's resolve the issue by deleting the file via `hg resolve` Let's resolve the issue by deleting the file via `hg resolve`
$ hg resolve --unmark file1 $ hg resolve --unmark file1
$ echo 'd' | hg resolve file1 --config ui.interactive=1 $ echo 'd' | hg resolve file1 --config ui.interactive=1
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? d What do you want to do? d
(no more unresolved files) (no more unresolved files)
$ hg resolve --list $ hg resolve --list
R file1 R file1
The file is deleted: The file is deleted:
$ [ -f file1 ] && echo "File still exists?" || true $ [ -f file1 ] && echo "File still exists?" || true
Doing `hg resolve --mark` doesn't break now that the file is missing: Doing `hg resolve --mark` doesn't break now that the file is missing:
$ hg resolve --mark --config commands.resolve.mark-check=abort $ hg resolve --mark --config commands.resolve.mark-check=abort
(no more unresolved files) (no more unresolved files)
$ hg resolve --mark --config commands.resolve.mark-check=warn $ hg resolve --mark --config commands.resolve.mark-check=warn
(no more unresolved files) (no more unresolved files)
Resurrect the file, and delete it outside of hg: Resurrect the file, and delete it outside of hg:
$ hg resolve --unmark file1 $ hg resolve --unmark file1
$ hg resolve file1 $ hg resolve file1
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
[1] [1]
$ [ -f file1 ] || echo "File does not exist?" $ [ -f file1 ] || echo "File does not exist?"
$ hg resolve --list $ hg resolve --list
U file1 U file1
$ rm file1 $ rm file1
$ hg resolve --mark --config commands.resolve.mark-check=abort $ hg resolve --mark --config commands.resolve.mark-check=abort
(no more unresolved files) (no more unresolved files)
$ hg resolve --list $ hg resolve --list
R file1 R file1
$ hg resolve --unmark file1 $ hg resolve --unmark file1
$ hg resolve file1 $ hg resolve file1
file 'file1' was deleted in other [merge rev] but was modified in local [working copy]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
[1] [1]
$ [ -f file1 ] || echo "File does not exist?" $ [ -f file1 ] || echo "File does not exist?"
$ hg resolve --list $ hg resolve --list
U file1 U file1
$ rm file1 $ rm file1
$ hg resolve --mark --config commands.resolve.mark-check=warn $ hg resolve --mark --config commands.resolve.mark-check=warn
(no more unresolved files) (no more unresolved files)
$ hg resolve --list $ hg resolve --list
R file1 R file1
$ cd .. $ cd ..

tests/test-sparse-merges.t

$ hg debugsparse --exclude "d" $ hg debugsparse --exclude "d"
$ ls $ ls
a a
$ hg merge $ hg merge
temporarily included 1 file(s) in the sparse checkout for merging temporarily included 1 file(s) in the sparse checkout for merging
file 'd' was deleted in other [merge rev] but was modified in local [working copy]. file 'd' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? You can use (c)hanged version, (d)elete, or leave (u)nresolved.
use (c)hanged version, (d)elete, or leave (u)nresolved? u What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ cd .. $ cd ..
Testing merging of a file which is renamed+modified on one side and modified on Testing merging of a file which is renamed+modified on one side and modified on
another another