This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11859

filemerge: make `_filemerge()` do both premerge and merge
ClosedPublic

Authored by martinvonz on Dec 4 2021, 2:06 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6b1049d71c3e: filemerge: make `_filemerge()` do both premerge and merge
Summary

This patch removes the premerge argument from _filemerge() and
makes it do both the "premerge" and "merge" steps without the caller
having to call it twice.

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.

Revision Contents
Changeset List

Diff 31383

hgext/largefiles/overrides.py

return orig(repo, actions, branchmerge, getfiledata) return orig(repo, actions, branchmerge, getfiledata)
# Override filemerge to prompt the user about how they wish to merge # Override filemerge to prompt the user about how they wish to merge
# largefiles. This will handle identical edits without prompting the user. # largefiles. This will handle identical edits without prompting the user.
@eh.wrapfunction(filemerge, b'_filemerge') @eh.wrapfunction(filemerge, b'_filemerge')
def overridefilemerge( def overridefilemerge(
origfn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None origfn, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
): ):
if not lfutil.isstandin(orig) or fcd.isabsent() or fco.isabsent(): if not lfutil.isstandin(orig) or fcd.isabsent() or fco.isabsent():
return origfn( return origfn(repo, wctx, mynode, orig, fcd, fco, fca, labels=labels)
premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels
)
ahash = lfutil.readasstandin(fca).lower() ahash = lfutil.readasstandin(fca).lower()
dhash = lfutil.readasstandin(fcd).lower() dhash = lfutil.readasstandin(fcd).lower()
ohash = lfutil.readasstandin(fco).lower() ohash = lfutil.readasstandin(fco).lower()
if ( if (
ohash != ahash ohash != ahash
and ohash != dhash and ohash != dhash
and ( and (

mercurial/filemerge.py

util.unlink(b) util.unlink(b)
util.unlink(c) util.unlink(c)
# if not uselocalpath, d is the 'orig'/backup file which we # if not uselocalpath, d is the 'orig'/backup file which we
# shouldn't delete. # shouldn't delete.
if d and uselocalpath: if d and uselocalpath:
util.unlink(d) util.unlink(d)
def _filemerge(premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None): def _filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
"""perform a 3-way merge in the working directory """perform a 3-way merge in the working directory
premerge = whether this is a premerge premerge = whether this is a premerge
mynode = parent node before merge mynode = parent node before merge
orig = original local filename before merge orig = original local filename before merge
fco = other file context fco = other file context
fca = ancestor file context fca = ancestor file context
fcd = local file context for current/destination file fcd = local file context for current/destination file
isexternal = True isexternal = True
toolconf = tool, toolpath, binary, symlink, scriptfn toolconf = tool, toolpath, binary, symlink, scriptfn
if mergetype == nomerge: if mergetype == nomerge:
r, deleted = func(repo, mynode, orig, fcd, fco, fca, toolconf, labels) r, deleted = func(repo, mynode, orig, fcd, fco, fca, toolconf, labels)
return True, r, deleted return True, r, deleted
if premerge:
if orig != fco.path(): if orig != fco.path():
ui.status( ui.status(
_(b"merging %s and %s to %s\n") _(b"merging %s and %s to %s\n")
% (uipathfn(orig), uipathfn(fco.path()), fduipath) % (uipathfn(orig), uipathfn(fco.path()), fduipath)
) )
else: else:
ui.status(_(b"merging %s\n") % fduipath) ui.status(_(b"merging %s\n") % fduipath)
ui.debug(b"my %s other %s ancestor %s\n" % (fcd, fco, fca)) ui.debug(b"my %s other %s ancestor %s\n" % (fcd, fco, fca))
if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, toolconf): if precheck and not precheck(repo, mynode, orig, fcd, fco, fca, toolconf):
if onfailure: if onfailure:
if wctx.isinmemory(): if wctx.isinmemory():
raise error.InMemoryMergeConflictsError( raise error.InMemoryMergeConflictsError(
b'in-memory merge does not support merge conflicts' b'in-memory merge does not support merge conflicts'
) )
ui.warn(onfailure % fduipath) ui.warn(onfailure % fduipath)
return True, 1, False return True, 1, False
back = _makebackup(repo, ui, wctx, fcd, premerge) back = _makebackup(repo, ui, wctx, fcd, True)
files = (None, None, None, back) files = (None, None, None, back)
r = 1 r = 1
try: try:
internalmarkerstyle = ui.config(b'ui', b'mergemarkers') internalmarkerstyle = ui.config(b'ui', b'mergemarkers')
if isexternal: if isexternal:
markerstyle = _toolstr(ui, tool, b'mergemarkers') markerstyle = _toolstr(ui, tool, b'mergemarkers')
else: else:
markerstyle = internalmarkerstyle markerstyle = internalmarkerstyle
if not labels: if not labels:
labels = _defaultconflictlabels labels = _defaultconflictlabels
formattedlabels = labels formattedlabels = labels
if markerstyle != b'basic': if markerstyle != b'basic':
formattedlabels = _formatlabels( formattedlabels = _formatlabels(
repo, fcd, fco, fca, labels, tool=tool repo, fcd, fco, fca, labels, tool=tool
) )
if premerge and mergetype == fullmerge: if mergetype == fullmerge:
# conflict markers generated by premerge will use 'detailed' # conflict markers generated by premerge will use 'detailed'
# settings if either ui.mergemarkers or the tool's mergemarkers # settings if either ui.mergemarkers or the tool's mergemarkers
# setting is 'detailed'. This way tools can have basic labels in # setting is 'detailed'. This way tools can have basic labels in
# space-constrained areas of the UI, but still get full information # space-constrained areas of the UI, but still get full information
# in conflict markers if premerge is 'keep' or 'keep-merge3'. # in conflict markers if premerge is 'keep' or 'keep-merge3'.
premergelabels = labels premergelabels = labels
labeltool = None labeltool = None
if markerstyle != b'basic': if markerstyle != b'basic':
# respect 'tool's mergemarkertemplate (which defaults to # respect 'tool's mergemarkertemplate (which defaults to
# command-templates.mergemarker) # command-templates.mergemarker)
labeltool = tool labeltool = tool
if internalmarkerstyle != b'basic' or markerstyle != b'basic': if internalmarkerstyle != b'basic' or markerstyle != b'basic':
premergelabels = _formatlabels( premergelabels = _formatlabels(
repo, fcd, fco, fca, premergelabels, tool=labeltool repo, fcd, fco, fca, premergelabels, tool=labeltool
) )
r = _premerge( r = _premerge(
repo, fcd, fco, fca, toolconf, files, labels=premergelabels repo, fcd, fco, fca, toolconf, files, labels=premergelabels
) )
# complete if premerge successful (r is 0) # we're done if premerge was successful (r is 0)
if not r:
return not r, r, False return not r, r, False
needcheck, r, deleted = func( needcheck, r, deleted = func(
repo, repo,
mynode, mynode,
orig, orig,
fcd, fcd,
fco, fco,
fca, fca,
return r return r
def _workingpath(repo, ctx): def _workingpath(repo, ctx):
return repo.wjoin(ctx.path()) return repo.wjoin(ctx.path())
def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None):
complete, merge_ret, deleted = _filemerge( return _filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=labels)
True, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels
)
if not complete:
complete, merge_ret, deleted = _filemerge(
False, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels
)
return complete, merge_ret, deleted
def loadinternalmerge(ui, extname, registrarobj): def loadinternalmerge(ui, extname, registrarobj):
"""Load internal merge tool from specified registrarobj""" """Load internal merge tool from specified registrarobj"""
for name, func in pycompat.iteritems(registrarobj._table): for name, func in pycompat.iteritems(registrarobj._table):
fullname = b':' + name fullname = b':' + name
internals[fullname] = func internals[fullname] = func
internals[b'internal:' + name] = func internals[b'internal:' + name] = func

tests/test-graft.t

ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
d: remote is newer -> g d: remote is newer -> g
getting d getting d
preserving e for resolve of e preserving e for resolve of e
e: versions differ -> m e: versions differ -> m
picked tool ':merge' for e (binary False symlink False changedelete False) picked tool ':merge' for e (binary False symlink False changedelete False)
merging e merging e
my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
picked tool ':merge' for e (binary False symlink False changedelete False)
my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue') (use 'hg resolve' and 'hg graft --continue')
[1] [1]
Summary should mention graft: Summary should mention graft:
$ hg summary |grep graft $ hg summary |grep graft

tests/test-merge-criss-cross.t

ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922
f1: remote is newer -> g f1: remote is newer -> g
getting f1 getting f1
preserving f2 for resolve of f2 preserving f2 for resolve of f2
f2: versions differ -> m f2: versions differ -> m
picked tool ':dump' for f2 (binary False symlink False changedelete False) picked tool ':dump' for f2 (binary False symlink False changedelete False)
merging f2 merging f2
my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527
picked tool ':dump' for f2 (binary False symlink False changedelete False)
my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527
1 files updated, 0 files merged, 0 files removed, 1 files unresolved 1 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]
$ f --dump * $ f --dump *
f1: f1:
>>> >>>
5 second change 5 second change

tests/test-merge-tools.t

[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 merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistentmergetool
couldn't find merge tool true (for pattern f) couldn't find merge tool true (for pattern f)
merging f merging f
couldn't find merge tool true (for pattern f)
merging f failed! merging f failed!
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
[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 merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool $ hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/nonexistent/mergetool
couldn't find merge tool true (for pattern f) couldn't find merge tool true (for pattern f)
merging f merging f
couldn't find merge tool true (for pattern f)
merging f failed! merging f failed!
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
false.whatever= false.whatever=
true.priority=1 true.priority=1
true.executable=cat true.executable=cat
missingbinary.executable=doesnotexist missingbinary.executable=doesnotexist
# hg update -C 1 # hg update -C 1
$ hg merge -y -r 2 --config ui.merge=missingbinary $ hg merge -y -r 2 --config ui.merge=missingbinary
couldn't find merge tool missingbinary (for pattern f) couldn't find merge tool missingbinary (for pattern f)
merging f merging f
couldn't find merge tool missingbinary (for pattern f)
revision 1 revision 1
space space
revision 0 revision 0
space space
revision 2 revision 2
space space
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)

tests/test-merge7.t

branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving test.txt for resolve of test.txt preserving test.txt for resolve of test.txt
test.txt: versions differ -> m test.txt: versions differ -> m
picked tool ':merge' for test.txt (binary False symlink False changedelete False) picked tool ':merge' for test.txt (binary False symlink False changedelete False)
merging test.txt merging test.txt
my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
picked tool ':merge' for test.txt (binary False symlink False changedelete False)
my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark') warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark')
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]
$ cat test.txt $ cat test.txt
one one
<<<<<<< working copy: 50c3a7e29886 - test: Merge 1 <<<<<<< working copy: 50c3a7e29886 - test: Merge 1

tests/test-rename-merge2.t

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 a and b to b merging a and b to b
my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337
premerge successful premerge successful
rev: versions differ -> m rev: versions differ -> m
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@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M b M b
a a
C a C a
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 and a to b merging b and a to b
my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337
premerge successful premerge successful
rev: versions differ -> m rev: versions differ -> m
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@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
1 files updated, 2 files merged, 0 files removed, 0 files unresolved 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M a M a
M b M b
a a
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 a and b to b merging a and b to b
my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337
premerge successful premerge successful
rev: versions differ -> m rev: versions differ -> m
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@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M b M b
a a
-------------- --------------
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 and a to b merging b and a to b
my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337
premerge successful premerge successful
rev: versions differ -> m rev: versions differ -> m
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@f4db7e329e71 ancestor rev@924404dff337 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M b M b
a a
-------------- --------------
ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24
b: remote created -> g b: remote created -> g
getting b getting b
preserving rev for resolve of rev preserving rev for resolve of rev
rev: versions differ -> m rev: versions differ -> m
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@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
1 files updated, 1 files merged, 0 files removed, 0 files unresolved 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M b M b
C a C a
-------------- --------------
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving rev for resolve of rev preserving rev for resolve of rev
rev: versions differ -> m rev: versions differ -> m
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@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
C a C a
C b C b
-------------- --------------
removing a removing a
b: remote created -> g b: remote created -> g
getting b getting b
preserving rev for resolve of rev preserving rev for resolve of rev
rev: versions differ -> m rev: versions differ -> m
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@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
1 files updated, 1 files merged, 1 files removed, 0 files unresolved 1 files updated, 1 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M b M b
-------------- --------------
branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving rev for resolve of rev preserving rev for resolve of rev
rev: versions differ -> m rev: versions differ -> m
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@97c705ade336 ancestor rev@924404dff337 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
C b C b
-------------- --------------
ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
b: both renamed from a -> m b: both renamed from a -> m
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@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0 merge tool returned: 0
rev: versions differ -> m rev: versions differ -> m
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@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M b M b
-------------- --------------
c c
c: remote created -> g c: remote created -> g
getting c getting c
preserving rev for resolve of rev preserving rev for resolve of rev
rev: versions differ -> m rev: versions differ -> m
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@fe905ef2c33e ancestor rev@924404dff337 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
1 files updated, 1 files merged, 0 files removed, 0 files unresolved 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M c M c
C b C b
-------------- --------------
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
b: both created -> m b: both created -> m
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@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0 merge tool returned: 0
rev: versions differ -> m rev: versions differ -> m
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@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M b M b
C a C a
-------------- --------------
removing a removing a
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
b: both created -> m b: both created -> m
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@59318016310c+ other b@bdb19105162a ancestor b@000000000000 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0 merge tool returned: 0
rev: versions differ -> m rev: versions differ -> m
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@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 2 files merged, 1 files removed, 0 files unresolved 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M b M b
-------------- --------------
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@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337
premerge successful premerge successful
rev: versions differ -> m rev: versions differ -> m
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@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
1 files updated, 2 files merged, 0 files removed, 0 files unresolved 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M a M a
M b M b
-------------- --------------
removing a removing a
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
b: both created -> m b: both created -> m
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@59318016310c+ other b@bdb19105162a ancestor b@000000000000 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0 merge tool returned: 0
rev: versions differ -> m rev: versions differ -> m
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@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 2 files merged, 1 files removed, 0 files unresolved 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M b M b
-------------- --------------
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@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337
premerge successful premerge successful
rev: versions differ -> m rev: versions differ -> m
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@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
1 files updated, 2 files merged, 0 files removed, 0 files unresolved 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M a M a
M b M b
-------------- --------------
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@4ce40f5aca24 ancestor a@924404dff337 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337
premerge successful premerge successful
rev: versions differ -> m rev: versions differ -> m
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@4ce40f5aca24 ancestor rev@924404dff337 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M b M b
C a C a
-------------- --------------
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 a@924404dff337 my b@02963e448370+ other b@8dbce441892a ancestor a@924404dff337
premerge successful premerge successful
rev: versions differ -> m rev: versions differ -> m
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
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M b M b
-------------- --------------
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 a@924404dff337 my b@0b76e65c8289+ other b@bdb19105162a ancestor a@924404dff337
premerge successful premerge successful
rev: versions differ -> m rev: versions differ -> m
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
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M b M b
C a C a
-------------- --------------
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving a for resolve of b preserving a for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
removing a removing a
b: remote moved from a -> m b: remote moved from a -> m
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 a and b to b merging a and b to b
my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0 merge tool returned: 0
rev: versions differ -> m rev: versions differ -> m
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@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M b M b
a a
-------------- --------------
ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving b for resolve of b preserving b for resolve of b
preserving rev for resolve of rev preserving rev for resolve of rev
b: local copied/moved from a -> m b: local copied/moved from a -> m
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 and a to b merging b and a to b
my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
merge tool returned: 0 merge tool returned: 0
rev: versions differ -> m rev: versions differ -> m
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@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 2 files merged, 0 files removed, 0 files unresolved 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M b M b
a a
-------------- --------------
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 and a to b merging b and a to b
my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
premerge successful premerge successful
rev: versions differ -> m rev: versions differ -> m
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@2b958612230f ancestor rev@924404dff337 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob) launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
merge tool returned: 0 merge tool returned: 0
1 files updated, 2 files merged, 0 files removed, 0 files unresolved 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
-------------- --------------
M b M b
a a
M c M c

tests/test-subrepo.t

branchmerge: True, force: False, partial: False branchmerge: True, force: False, partial: False
ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving t for resolve of t preserving t for resolve of t
t: versions differ -> m t: versions differ -> m
picked tool ':merge' for t (binary False symlink False changedelete False) picked tool ':merge' for t (binary False symlink False changedelete False)
merging t merging t
my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
picked tool ':merge' for t (binary False symlink False changedelete False)
my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
warning: conflicts while merging t! (edit, then use 'hg resolve --mark') warning: conflicts while merging t! (edit, then use 'hg resolve --mark')
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
subrepo t: merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg subrepo t: merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
should conflict should conflict

tests/test-up-local-change.t

ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb
b: remote created -> g b: remote created -> g
getting b getting b
preserving a for resolve of a preserving a for resolve of a
a: versions differ -> m a: versions differ -> m
picked tool 'true' for a (binary False symlink False changedelete False) picked tool 'true' for a (binary False symlink False changedelete False)
merging a merging a
my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
picked tool 'true' for a (binary False symlink False changedelete False)
my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
launching merge tool: true *$TESTTMP/r2/a* * * (glob) launching merge tool: true *$TESTTMP/r2/a* * * (glob)
merge tool returned: 0 merge tool returned: 0
1 files updated, 1 files merged, 0 files removed, 0 files unresolved 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ hg parents $ hg parents
changeset: 1:1e71731e6fbb changeset: 1:1e71731e6fbb
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: 2 summary: 2
$ hg --debug up 0 $ hg --debug up 0
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
resolving manifests resolving manifests
branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False
ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a
b: other deleted -> r b: other deleted -> r
removing b removing b
starting 4 threads for background file closing (?) starting 4 threads for background file closing (?)
preserving a for resolve of a preserving a for resolve of a
a: versions differ -> m a: versions differ -> m
picked tool 'true' for a (binary False symlink False changedelete False) picked tool 'true' for a (binary False symlink False changedelete False)
merging a merging a
my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
picked tool 'true' for a (binary False symlink False changedelete False)
my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
launching merge tool: true *$TESTTMP/r2/a* * * (glob) launching merge tool: true *$TESTTMP/r2/a* * * (glob)
merge tool returned: 0 merge tool returned: 0
0 files updated, 1 files merged, 1 files removed, 0 files unresolved 0 files updated, 1 files merged, 1 files removed, 0 files unresolved
$ hg parents $ hg parents
changeset: 0:c19d34741b0a changeset: 0:c19d34741b0a
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: 1 summary: 1
$ hg --debug up $ hg --debug up
resolving manifests resolving manifests
branchmerge: False, force: False, partial: False branchmerge: False, force: False, partial: False
ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb
b: remote created -> g b: remote created -> g
getting b getting b
preserving a for resolve of a preserving a for resolve of a
a: versions differ -> m a: versions differ -> m
picked tool 'true' for a (binary False symlink False changedelete False) picked tool 'true' for a (binary False symlink False changedelete False)
merging a merging a
my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
picked tool 'true' for a (binary False symlink False changedelete False)
my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
launching merge tool: true *$TESTTMP/r2/a* * * (glob) launching merge tool: true *$TESTTMP/r2/a* * * (glob)
merge tool returned: 0 merge tool returned: 0
1 files updated, 1 files merged, 0 files removed, 0 files unresolved 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ hg parents $ hg parents
changeset: 1:1e71731e6fbb changeset: 1:1e71731e6fbb
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000