This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4375

filemerge: fix the wrong placements of messages in prompt
ClosedPublic

Authored by pulkit on Aug 26 2018, 12:16 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa3fd84f4fb38: filemerge: fix the wrong placements of messages in prompt
Summary

Mistakenly, the local-changed-other-deleted-message was put in
other-change-local-deleted and vice versa. This followups on D4336.

Thanks to Yuya who spotted this.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Aug 26 2018, 12:16 PM
Closed by commit rHGa3fd84f4fb38: filemerge: fix the wrong placements of messages in prompt (authored by pulkit). · Explain WhyAug 27 2018, 8:23 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 10573

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
_localchangedotherdeletedmsg = _( _localchangedotherdeletedmsg = _(
"file '%(fd)s' was deleted in local%(l)s but was modified in other%(o)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" "What do you want to do?\n"
"use (c)hanged version, (d)elete, or leave (u)nresolved?" "use (c)hanged version, (d)elete, or leave (u)nresolved?"
"$$ &Changed $$ &Delete $$ &Unresolved") "$$ &Changed $$ &Delete $$ &Unresolved")
_otherchangedlocaldeletedmsg = _( _otherchangedlocaldeletedmsg = _(
"file '%(fd)s' was deleted in other%(o)s but was modified in local%(l)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" "What do you want to do?\n"
"use (c)hanged version, leave (d)eleted, or " "use (c)hanged version, leave (d)eleted, or "
"leave (u)nresolved?" "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.

tests/test-commit-amend.t

$ hg rm aa $ hg rm aa
$ 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 local [working copy] but was modified in other [merge rev]. file 'aa' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? c use (c)hanged version, (d)elete, or leave (u)nresolved? 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

tests/test-copy-move-merge.t

$ hg strip -r . --config extensions.strip= $ hg strip -r . --config extensions.strip=
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 other [source] but was modified in local [dest]. file 'a' was deleted in local [dest] but was modified in other [source].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
$ cat b $ cat b
1 1
2 2
$ cd .. $ cd ..

tests/test-copytrace-heuristics.t

| desc: mode a | desc: mode a
| o changeset: 46985f76c7e5e5123433527f5c8526806145650b | o changeset: 46985f76c7e5e5123433527f5c8526806145650b
|/ desc: rm a, add b |/ desc: rm a, add b
o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0
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 other [source] but was modified in local [dest]. file 'a' was deleted in local [dest] but was modified in other [source].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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
o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98 o changeset: 1451231c87572a7d3f92fc210b4b35711c949a98
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 other [source] but was modified in local [dest]. file 'a' was deleted in local [dest] but was modified in other [source].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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
|/ desc added more things to a, phase: draft |/ desc added more things to a, phase: draft
o changeset 9092f1db7931481f93b37d5c9fbcfc341bcd7318 o changeset 9092f1db7931481f93b37d5c9fbcfc341bcd7318
desc added a, phase: draft desc added a, phase: draft
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 8b6e13696 -d . $ hg rebase -s 8b6e13696 -d .
rebasing 1:8b6e13696c38 "added more things to a" rebasing 1:8b6e13696c38 "added more things to a"
file 'a' was deleted in other [source] but was modified in local [dest]. file 'a' was deleted in local [dest] but was modified in other [source].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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 8b6e13696 -d . --config experimental.copytrace.sourcecommitlimit=100 $ hg rebase -s 8b6e13696 -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

$ hg resolve -m normal1 $ hg resolve -m normal1
(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 local [dest] but was modified in other [source]. file '.hglf/large1' was deleted in other [source] but was modified in local [dest].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? c use (c)hanged version, (d)elete, or leave (u)nresolved? 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

tests/test-merge-changedelete.t

$ echo changed2 >> file3 $ echo changed2 >> file3
$ 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 local [working copy] but was modified in other [merge rev]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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]
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 <<EOF $ hg merge --config ui.interactive=true <<EOF
> c > c
> d > d
> EOF > EOF
file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? c use (c)hanged version, (d)elete, or leave (u)nresolved? c
file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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]
$ 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 local [working copy] but was modified in other [merge rev]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? foo use (c)hanged version, (d)elete, or leave (u)nresolved? foo
unrecognized response unrecognized response
file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? bar use (c)hanged version, (d)elete, or leave (u)nresolved? bar
unrecognized response unrecognized response
file 'file1' was deleted in local [working copy] but was modified in other [merge rev]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? d use (c)hanged version, (d)elete, or leave (u)nresolved? d
file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? baz use (c)hanged version, leave (d)eleted, or leave (u)nresolved? baz
unrecognized response unrecognized response
file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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]
$ hg co -C $ hg co -C
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 local [working copy] but was modified in other [merge rev]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? d use (c)hanged version, (d)elete, or leave (u)nresolved? d
file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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]
Force prompts with no input (should be similar to :fail) Force prompts with no input (should be similar to :fail)
$ 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 local [working copy] but was modified in other [merge rev]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? use (c)hanged version, (d)elete, or leave (u)nresolved?
file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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? 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 ---
Force prompts Force prompts
$ 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 local [working copy] but was modified in other [merge rev]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? u keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for file3? 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 ---
Choose to merge all files Choose to merge all files
$ 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 local [working copy] but was modified in other [merge rev]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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 identical) (status identical)
=== :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 local [working copy] but was modified in other [merge rev]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? use (c)hanged version, (d)elete, or leave (u)nresolved?
file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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? 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)
(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 local [working copy] but was modified in other [merge rev]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? use (c)hanged version, (d)elete, or leave (u)nresolved?
file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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? 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 local [working copy] but was modified in other [merge rev]. file 'file1' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? use (c)hanged version, (d)elete, or leave (u)nresolved?
file 'file2' was deleted in other [merge rev] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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? 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 local [working copy] but was modified in other [destination]. file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
file 'file2' was deleted in other [destination] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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
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 local [working copy] but was modified in other [destination]. file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? use (c)hanged version, (d)elete, or leave (u)nresolved?
file 'file2' was deleted in other [destination] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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
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 local [working copy] but was modified in other [destination]. file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
file 'file2' was deleted in other [destination] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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
(status identical) (status identical)
=== :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 local [working copy] but was modified in other [destination]. file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? use (c)hanged version, (d)elete, or leave (u)nresolved?
file 'file2' was deleted in other [destination] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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)
=== :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 local [working copy] but was modified in other [destination]. file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? use (c)hanged version, (d)elete, or leave (u)nresolved?
file 'file2' was deleted in other [destination] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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 local [working copy] but was modified in other [destination]. file 'file1' was deleted in other [destination] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? use (c)hanged version, (d)elete, or leave (u)nresolved?
file 'file2' was deleted in other [destination] but was modified in local [working copy]. file 'file2' was deleted in local [working copy] but was modified in other [destination].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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 local [working copy] but was modified in other [merge rev]. 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? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
file 'content1_missing_content3_content3-tracked' was deleted in local [working copy] but was modified in other [merge rev]. 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? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
file 'content1_missing_content3_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev]. 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? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
file 'content1_missing_missing_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev]. 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? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
file 'content1_content2_content1_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content1_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content1_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content1_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content1_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content2_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content2_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content2_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content2_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content2_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content3_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content3_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content3_content3-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content3_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content3_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content3_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_missing_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_missing_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_missing_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_missing_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_missing_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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
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 other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content1_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content1_content4-tracked merging content1_content2_content1_content4-tracked
file 'content1_content2_content1_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content1_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content1_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content2_content1-tracked merging content1_content2_content2_content1-tracked
file 'content1_content2_content2_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content2_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content2_content4-tracked merging content1_content2_content2_content4-tracked
file 'content1_content2_content2_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content2_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content2_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content3_content1-tracked merging content1_content2_content3_content1-tracked
file 'content1_content2_content3_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content3_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content3_content3-tracked merging content1_content2_content3_content3-tracked
file 'content1_content2_content3_content3-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_content3_content4-tracked merging content1_content2_content3_content4-tracked
file 'content1_content2_content3_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content3_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_content3_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_missing_content1-tracked merging content1_content2_missing_content1-tracked
file 'content1_content2_missing_content1-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_missing_content2-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
merging content1_content2_missing_content4-tracked merging content1_content2_missing_content4-tracked
file 'content1_content2_missing_content4-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_missing_missing-tracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_content2_missing_missing-untracked' was deleted in other [merge rev] but was modified in local [working copy]. 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? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
file 'content1_missing_content1_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev]. 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? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
file 'content1_missing_content3_content3-tracked' was deleted in local [working copy] but was modified in other [merge rev]. 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? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
file 'content1_missing_content3_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev]. 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? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? u
file 'content1_missing_missing_content4-tracked' was deleted in local [working copy] but was modified in other [merge rev]. 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? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? 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')

tests/test-merge-remove.t

abort: untracked files in working directory differ from files in requested revision abort: untracked files in working directory differ from files in requested revision
[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 other [merge rev] but was modified in local [working copy]. file 'bar' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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 other [destination] but was modified in local [working copy]. file 'b' was deleted in local [working copy] but was modified in other [destination].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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

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: rebase of 1:1d1a643d390e created no changes to commit note: rebase of 1:1d1a643d390e created no changes to commit
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 other [source] but was modified in local [dest]. file 'f-default' was deleted in local [dest] but was modified in other [source].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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'
$ cd ../ancestor-merge-2 $ cd ../ancestor-merge-2
$ 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 other [source] but was modified in local [dest]. file 'f-default' was deleted in local [dest] but was modified in other [source].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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'

tests/test-rename-merge2.t

resolving manifests resolving manifests
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 other [merge rev] but was modified in local [working copy]. file 'a' was deleted in local [working copy] but was modified in other [merge rev].
What do you want to do? What do you want to do?
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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)
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
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 local [working copy] but was modified in other [merge rev]. file 'a' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? 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)

tests/test-sparse-merges.t

o 0:53f3774ed939 added .hgignore o 0:53f3774ed939 added .hgignore
$ 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 local [working copy] but was modified in other [merge rev]. file 'd' was deleted in other [merge rev] but was modified in local [working copy].
What do you want to do? What do you want to do?
use (c)hanged version, (d)elete, or leave (u)nresolved? u use (c)hanged version, (d)elete, or leave (u)nresolved? 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]