This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8392

[RFC] mergestate: store about files resolved in favour of other
ClosedPublic

Authored by pulkit on Apr 10 2020, 6:43 AM.

Details

Reviewers
marmoute
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG1b8fd4af3318: mergestate: store about files resolved in favour of other
Summary

Committing a merge sometimes wrongly creates a new filenode where it can re-use
an existing one. This happens because the commit code does it's own calculation
and does not know what happened on merge.

This starts storing information in mergestate about files which were
automatically merged and the other/remote version of file was used.
We need this information at commit to pick the filenode parent for the new
commit.

This issue was found by Pierre-Yves David and idea to store the relevant parts
in mergestate is also suggested by him.

Somethings which can be further investigated are:

  1. refactoring of commit logic more to depend on this information
  2. maybe a more generic solution?

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit created this revision.Apr 10 2020, 6:43 AM
pulkit mentioned this in D8243: copies: stop recording buggy file merge when new file overwrite an old one.Apr 10 2020, 7:39 AM

This attempts to fix the issue which D8243 tries to fix by storing extra information in mergestate.

marmoute accepted this revision.Apr 10 2020, 7:56 AM
marmoute added a subscriber: marmoute.

The approach seems good and the test change seems consistent with D8243 (@pulkit can you confirm there are no difference?)

This looks good to me.

pulkit edited the summary of this revision. (Show Details)Apr 10 2020, 10:28 AM
durin42 added subscribers: martinvonz, durin42.Apr 10 2020, 12:00 PM
durin42 accepted this revision as: durin42.

I like it, but want to get @martinvonz to look too.

martinvonz accepted this revision.Apr 10 2020, 12:11 PM
This revision is now accepted and ready to land.Apr 10 2020, 12:11 PM
pulkit added a commit: rHG1b8fd4af3318: mergestate: store about files resolved in favour of other.Apr 10 2020, 12:48 PM
Closed by commit rHG1b8fd4af3318: mergestate: store about files resolved in favour of other (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added inline comments.Oct 6 2020, 4:28 PM
tests/test-copies-chain-merge.t
311–313

Could you send a follow-up updating this?

367

The hash no longer exists, and maybe it's no longer wrong?

381

And I don't think this is wrong anymore (i.e. the comment is now wrong)

388

Would be clearer to update this too. Either simply delete it or say what it should show in order to be correct (e.g. "log output should not include the merge commit").

549

Is this still true?

555

delete

583

And this comment also seems wrong now

593

As above, delete to clarify

pulkit added a comment.Oct 7 2020, 3:59 AM

@martinvonz sent D9168 as followup for all the comments.

Revision Contents
Changeset List

Diff 21024

mercurial/commands.py

b'D', b'D',
), ),
} }
for f in ms: for f in ms:
if not m(f): if not m(f):
continue continue
if ms[f] == mergemod.MERGE_RECORD_MERGED_OTHER:
continue
label, key = mergestateinfo[ms[f]] label, key = mergestateinfo[ms[f]]
fm.startitem() fm.startitem()
fm.context(ctx=wctx) fm.context(ctx=wctx)
fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label) fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)
fm.data(path=f) fm.data(path=f)
fm.plain(b'%s\n' % uipathfn(f), label=label) fm.plain(b'%s\n' % uipathfn(f), label=label)
fm.end() fm.end()
return 0 return 0
# Treat all invalid / unrecognized values as 'none'. # Treat all invalid / unrecognized values as 'none'.
markcheck = False markcheck = False
for f in ms: for f in ms:
if not m(f): if not m(f):
continue continue
didwork = True didwork = True
if ms[f] == mergemod.MERGE_RECORD_MERGED_OTHER:
continue
# don't let driver-resolved files be marked, and run the conclude # don't let driver-resolved files be marked, and run the conclude
# step if asked to resolve # step if asked to resolve
if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED: if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:
exact = m.exact(f) exact = m.exact(f)
if mark: if mark:
if exact: if exact:
ui.warn( ui.warn(
_(b'not marking %s as it is driver-resolved\n') _(b'not marking %s as it is driver-resolved\n')

mercurial/localrepo.py

fparent1, fparent2 = fparent2, nullid fparent1, fparent2 = fparent2, nullid
elif fparent2 != nullid: elif fparent2 != nullid:
# is one parent an ancestor of the other? # is one parent an ancestor of the other?
fparentancestors = flog.commonancestorsheads(fparent1, fparent2) fparentancestors = flog.commonancestorsheads(fparent1, fparent2)
if fparent1 in fparentancestors: if fparent1 in fparentancestors:
fparent1, fparent2 = fparent2, nullid fparent1, fparent2 = fparent2, nullid
elif fparent2 in fparentancestors: elif fparent2 in fparentancestors:
fparent2 = nullid fparent2 = nullid
elif not fparentancestors:
# TODO: this whole if-else might be simplified much more
ms = mergemod.mergestate.read(self)
if (
fname in ms
and ms[fname] == mergemod.MERGE_RECORD_MERGED_OTHER
):
fparent1, fparent2 = fparent2, nullid
# is the file changed? # is the file changed?
text = fctx.data() text = fctx.data()
if fparent2 != nullid or flog.cmp(fparent1, text) or meta: if fparent2 != nullid or flog.cmp(fparent1, text) or meta:
changelist.append(fname) changelist.append(fname)
return flog.add(text, meta, tr, linkrev, fparent1, fparent2) return flog.add(text, meta, tr, linkrev, fparent1, fparent2)
# are just the flags changed during merge? # are just the flags changed during merge?
elif fname in manifest1 and manifest1.flags(fname) != fctx.flags(): elif fname in manifest1 and manifest1.flags(fname) != fctx.flags():

mercurial/merge.py

RECORD_MERGE_DRIVER_MERGE = b'D' RECORD_MERGE_DRIVER_MERGE = b'D'
RECORD_PATH_CONFLICT = b'P' RECORD_PATH_CONFLICT = b'P'
RECORD_MERGE_DRIVER_STATE = b'm' RECORD_MERGE_DRIVER_STATE = b'm'
RECORD_FILE_VALUES = b'f' RECORD_FILE_VALUES = b'f'
RECORD_LABELS = b'l' RECORD_LABELS = b'l'
RECORD_OVERRIDE = b't' RECORD_OVERRIDE = b't'
RECORD_UNSUPPORTED_MANDATORY = b'X' RECORD_UNSUPPORTED_MANDATORY = b'X'
RECORD_UNSUPPORTED_ADVISORY = b'x' RECORD_UNSUPPORTED_ADVISORY = b'x'
RECORD_RESOLVED_OTHER = b'R'
MERGE_DRIVER_STATE_UNMARKED = b'u' MERGE_DRIVER_STATE_UNMARKED = b'u'
MERGE_DRIVER_STATE_MARKED = b'm' MERGE_DRIVER_STATE_MARKED = b'm'
MERGE_DRIVER_STATE_SUCCESS = b's' MERGE_DRIVER_STATE_SUCCESS = b's'
MERGE_RECORD_UNRESOLVED = b'u' MERGE_RECORD_UNRESOLVED = b'u'
MERGE_RECORD_RESOLVED = b'r' MERGE_RECORD_RESOLVED = b'r'
MERGE_RECORD_UNRESOLVED_PATH = b'pu' MERGE_RECORD_UNRESOLVED_PATH = b'pu'
MERGE_RECORD_RESOLVED_PATH = b'pr' MERGE_RECORD_RESOLVED_PATH = b'pr'
MERGE_RECORD_DRIVER_RESOLVED = b'd' MERGE_RECORD_DRIVER_RESOLVED = b'd'
# represents that the file was automatically merged in favor
# of other version. This info is used on commit.
MERGE_RECORD_MERGED_OTHER = b'o'
ACTION_FORGET = b'f' ACTION_FORGET = b'f'
ACTION_REMOVE = b'r' ACTION_REMOVE = b'r'
ACTION_ADD = b'a' ACTION_ADD = b'a'
ACTION_GET = b'g' ACTION_GET = b'g'
ACTION_PATH_CONFLICT = b'p' ACTION_PATH_CONFLICT = b'p'
ACTION_PATH_CONFLICT_RESOLVE = b'pr' ACTION_PATH_CONFLICT_RESOLVE = b'pr'
ACTION_ADD_MODIFIED = b'am' ACTION_ADD_MODIFIED = b'am'
ACTION_CREATED = b'c' ACTION_CREATED = b'c'
ACTION_DELETED_CHANGED = b'dc' ACTION_DELETED_CHANGED = b'dc'
ACTION_CHANGED_DELETED = b'cd' ACTION_CHANGED_DELETED = b'cd'
ACTION_MERGE = b'm' ACTION_MERGE = b'm'
ACTION_LOCAL_DIR_RENAME_GET = b'dg' ACTION_LOCAL_DIR_RENAME_GET = b'dg'
ACTION_DIR_RENAME_MOVE_LOCAL = b'dm' ACTION_DIR_RENAME_MOVE_LOCAL = b'dm'
ACTION_KEEP = b'k' ACTION_KEEP = b'k'
ACTION_EXEC = b'e' ACTION_EXEC = b'e'
ACTION_CREATED_MERGE = b'cm' ACTION_CREATED_MERGE = b'cm'
# GET the other/remote side and store this info in mergestate
ACTION_GET_OTHER_AND_STORE = b'gs'
class mergestate(object): class mergestate(object):
'''track 3-way merge state of individual files '''track 3-way merge state of individual files
The merge state is stored on disk when needed. Two files are used: one with The merge state is stored on disk when needed. Two files are used: one with
an old format (version 1), and one with a new format (version 2). Version 2 an old format (version 1), and one with a new format (version 2). Version 2
stores a superset of the data in version 1, including new kinds of records stores a superset of the data in version 1, including new kinds of records
self._readmergedriver = bits[0] self._readmergedriver = bits[0]
self._mdstate = mdstate self._mdstate = mdstate
elif rtype in ( elif rtype in (
RECORD_MERGED, RECORD_MERGED,
RECORD_CHANGEDELETE_CONFLICT, RECORD_CHANGEDELETE_CONFLICT,
RECORD_PATH_CONFLICT, RECORD_PATH_CONFLICT,
RECORD_MERGE_DRIVER_MERGE, RECORD_MERGE_DRIVER_MERGE,
RECORD_RESOLVED_OTHER,
): ):
bits = record.split(b'\0') bits = record.split(b'\0')
self._state[bits[0]] = bits[1:] self._state[bits[0]] = bits[1:]
elif rtype == RECORD_FILE_VALUES: elif rtype == RECORD_FILE_VALUES:
filename, rawextras = record.split(b'\0', 1) filename, rawextras = record.split(b'\0', 1)
extraparts = rawextras.split(b'\0') extraparts = rawextras.split(b'\0')
extras = {} extras = {}
i = 0 i = 0
MERGE_RECORD_UNRESOLVED_PATH, MERGE_RECORD_UNRESOLVED_PATH,
MERGE_RECORD_RESOLVED_PATH, MERGE_RECORD_RESOLVED_PATH,
): ):
# Path conflicts. These are stored in 'P' records. The current # Path conflicts. These are stored in 'P' records. The current
# resolution state ('pu' or 'pr') is stored within the record. # resolution state ('pu' or 'pr') is stored within the record.
records.append( records.append(
(RECORD_PATH_CONFLICT, b'\0'.join([filename] + v)) (RECORD_PATH_CONFLICT, b'\0'.join([filename] + v))
) )
elif v[0] == MERGE_RECORD_MERGED_OTHER:
records.append(
(RECORD_RESOLVED_OTHER, b'\0'.join([filename] + v))
)
elif v[1] == nullhex or v[6] == nullhex: elif v[1] == nullhex or v[6] == nullhex:
# Change/Delete or Delete/Change conflicts. These are stored in # Change/Delete or Delete/Change conflicts. These are stored in
# 'C' records. v[1] is the local file, and is nullhex when the # 'C' records. v[1] is the local file, and is nullhex when the
# file is deleted locally ('dc'). v[6] is the remote file, and # file is deleted locally ('dc'). v[6] is the remote file, and
# is nullhex when the file is deleted remotely ('cd'). # is nullhex when the file is deleted remotely ('cd').
records.append( records.append(
(RECORD_CHANGEDELETE_CONFLICT, b'\0'.join([filename] + v)) (RECORD_CHANGEDELETE_CONFLICT, b'\0'.join([filename] + v))
) )
"""add a new conflicting path to the merge state """add a new conflicting path to the merge state
path: the path that conflicts path: the path that conflicts
frename: the filename the conflicting file was renamed to frename: the filename the conflicting file was renamed to
forigin: origin of the file ('l' or 'r' for local/remote) forigin: origin of the file ('l' or 'r' for local/remote)
""" """
self._state[path] = [MERGE_RECORD_UNRESOLVED_PATH, frename, forigin] self._state[path] = [MERGE_RECORD_UNRESOLVED_PATH, frename, forigin]
self._dirty = True self._dirty = True
def addmergedother(self, path):
self._state[path] = [MERGE_RECORD_MERGED_OTHER, nullhex, nullhex]
self._dirty = True
def __contains__(self, dfile): def __contains__(self, dfile):
return dfile in self._state return dfile in self._state
def __getitem__(self, dfile): def __getitem__(self, dfile):
return self._state[dfile][0] return self._state[dfile][0]
def __iter__(self): def __iter__(self):
return iter(sorted(self._state)) return iter(sorted(self._state))
def extras(self, filename): def extras(self, filename):
return self._stateextras.setdefault(filename, {}) return self._stateextras.setdefault(filename, {})
def _resolve(self, preresolve, dfile, wctx): def _resolve(self, preresolve, dfile, wctx):
"""rerun merge process for file path `dfile`""" """rerun merge process for file path `dfile`"""
if self[dfile] in (MERGE_RECORD_RESOLVED, MERGE_RECORD_DRIVER_RESOLVED): if self[dfile] in (MERGE_RECORD_RESOLVED, MERGE_RECORD_DRIVER_RESOLVED):
return True, 0 return True, 0
if self._state[dfile][0] == MERGE_RECORD_MERGED_OTHER:
return True, 0
stateentry = self._state[dfile] stateentry = self._state[dfile]
state, localkey, lfile, afile, anode, ofile, onode, flags = stateentry state, localkey, lfile, afile, anode, ofile, onode, flags = stateentry
octx = self._repo[self._other] octx = self._repo[self._other]
extras = self.extras(dfile) extras = self.extras(dfile)
anccommitnode = extras.get(b'ancestorlinknode') anccommitnode = extras.get(b'ancestorlinknode')
if anccommitnode: if anccommitnode:
actx = self._repo[anccommitnode] actx = self._repo[anccommitnode]
else: else:
def _filternarrowactions(narrowmatch, branchmerge, actions): def _filternarrowactions(narrowmatch, branchmerge, actions):
""" """
Filters out actions that can ignored because the repo is narrowed. Filters out actions that can ignored because the repo is narrowed.
Raise an exception if the merge cannot be completed because the repo is Raise an exception if the merge cannot be completed because the repo is
narrowed. narrowed.
""" """
nooptypes = {b'k'} # TODO: handle with nonconflicttypes nooptypes = {b'k'} # TODO: handle with nonconflicttypes
nonconflicttypes = set(b'a am c cm f g r e'.split()) nonconflicttypes = set(b'a am c cm f g gs r e'.split())
# We mutate the items in the dict during iteration, so iterate # We mutate the items in the dict during iteration, so iterate
# over a copy. # over a copy.
for f, action in list(actions.items()): for f, action in list(actions.items()):
if narrowmatch(f): if narrowmatch(f):
pass pass
elif not branchmerge: elif not branchmerge:
del actions[f] # just updating, ignore changes outside clone del actions[f] # just updating, ignore changes outside clone
elif action[0] in nooptypes: elif action[0] in nooptypes:
if n1 == n2: # optimization: keep local content if n1 == n2: # optimization: keep local content
actions[f] = ( actions[f] = (
ACTION_EXEC, ACTION_EXEC,
(fl2,), (fl2,),
b'update permissions', b'update permissions',
) )
else: else:
actions[f] = ( actions[f] = (
ACTION_GET, ACTION_GET_OTHER_AND_STORE
if branchmerge
else ACTION_GET,
(fl2, False), (fl2, False),
b'remote is newer', b'remote is newer',
) )
elif nol and n2 == a: # remote only changed 'x' elif nol and n2 == a: # remote only changed 'x'
actions[f] = (ACTION_EXEC, (fl2,), b'update permissions') actions[f] = (ACTION_EXEC, (fl2,), b'update permissions')
elif nol and n1 == a: # local only changed 'x' elif nol and n1 == a: # local only changed 'x'
actions[f] = (ACTION_GET, (fl1, False), b'remote is newer') actions[f] = (
ACTION_GET_OTHER_AND_STORE
if branchmerge
else ACTION_GET,
(fl1, False),
b'remote is newer',
)
else: # both changed something else: # both changed something
actions[f] = ( actions[f] = (
ACTION_MERGE, ACTION_MERGE,
(f, f, f, False, pa.node()), (f, f, f, False, pa.node()),
b'versions differ', b'versions differ',
) )
elif n1: # file exists only on local side elif n1: # file exists only on local side
if f in copied2: if f in copied2:
# merge will correctly incorporate more information # merge will correctly incorporate more information
if diverge is None or len(diverge1) < len(diverge): if diverge is None or len(diverge1) < len(diverge):
diverge = diverge1 diverge = diverge1
if renamedelete is None or len(renamedelete) < len(renamedelete1): if renamedelete is None or len(renamedelete) < len(renamedelete1):
renamedelete = renamedelete1 renamedelete = renamedelete1
for f, a in sorted(pycompat.iteritems(actions)): for f, a in sorted(pycompat.iteritems(actions)):
m, args, msg = a m, args, msg = a
if m == ACTION_GET_OTHER_AND_STORE:
m = ACTION_GET
repo.ui.debug(b' %s: %s -> %s\n' % (f, msg, m)) repo.ui.debug(b' %s: %s -> %s\n' % (f, msg, m))
if f in fbids: if f in fbids:
d = fbids[f] d = fbids[f]
if m in d: if m in d:
d[m].append(a) d[m].append(a)
else: else:
d[m] = [a] d[m] = [a]
else: else:
ACTION_REMOVE, ACTION_REMOVE,
ACTION_DIR_RENAME_MOVE_LOCAL, ACTION_DIR_RENAME_MOVE_LOCAL,
ACTION_LOCAL_DIR_RENAME_GET, ACTION_LOCAL_DIR_RENAME_GET,
ACTION_MERGE, ACTION_MERGE,
ACTION_EXEC, ACTION_EXEC,
ACTION_KEEP, ACTION_KEEP,
ACTION_PATH_CONFLICT, ACTION_PATH_CONFLICT,
ACTION_PATH_CONFLICT_RESOLVE, ACTION_PATH_CONFLICT_RESOLVE,
ACTION_GET_OTHER_AND_STORE,
) )
} }
def applyupdates( def applyupdates(
repo, actions, wctx, mctx, overwrite, wantfiledata, labels=None repo, actions, wctx, mctx, overwrite, wantfiledata, labels=None
): ):
"""apply the merge action list to the working directory """apply the merge action list to the working directory
wctx is the working copy context wctx is the working copy context
mctx is the context to be merged into the working copy mctx is the context to be merged into the working copy
Return a tuple of (counts, filedata), where counts is a tuple Return a tuple of (counts, filedata), where counts is a tuple
(updated, merged, removed, unresolved) that describes how many (updated, merged, removed, unresolved) that describes how many
files were affected by the update, and filedata is as described in files were affected by the update, and filedata is as described in
batchget. batchget.
""" """
_prefetchfiles(repo, mctx, actions) _prefetchfiles(repo, mctx, actions)
updated, merged, removed = 0, 0, 0 updated, merged, removed = 0, 0, 0
ms = mergestate.clean(repo, wctx.p1().node(), mctx.node(), labels) ms = mergestate.clean(repo, wctx.p1().node(), mctx.node(), labels)
# add ACTION_GET_OTHER_AND_STORE to mergestate
for e in actions[ACTION_GET_OTHER_AND_STORE]:
ms.addmergedother(e[0])
moves = [] moves = []
for m, l in actions.items(): for m, l in actions.items():
l.sort() l.sort()
# 'cd' and 'dc' actions are treated like other merge conflicts # 'cd' and 'dc' actions are treated like other merge conflicts
mergeactions = sorted(actions[ACTION_CHANGED_DELETED]) mergeactions = sorted(actions[ACTION_CHANGED_DELETED])
mergeactions.extend(sorted(actions[ACTION_DELETED_CHANGED])) mergeactions.extend(sorted(actions[ACTION_DELETED_CHANGED]))
mergeactions.extend(actions[ACTION_MERGE]) mergeactions.extend(actions[ACTION_MERGE])
if updatecheck == UPDATECHECK_NO_CONFLICT: if updatecheck == UPDATECHECK_NO_CONFLICT:
for f, (m, args, msg) in pycompat.iteritems(actionbyfile): for f, (m, args, msg) in pycompat.iteritems(actionbyfile):
if m not in ( if m not in (
ACTION_GET, ACTION_GET,
ACTION_KEEP, ACTION_KEEP,
ACTION_EXEC, ACTION_EXEC,
ACTION_REMOVE, ACTION_REMOVE,
ACTION_PATH_CONFLICT_RESOLVE, ACTION_PATH_CONFLICT_RESOLVE,
ACTION_GET_OTHER_AND_STORE,
): ):
msg = _(b"conflicting changes") msg = _(b"conflicting changes")
hint = _(b"commit or update --clean to discard changes") hint = _(b"commit or update --clean to discard changes")
raise error.Abort(msg, hint=hint) raise error.Abort(msg, hint=hint)
# Prompt and create actions. Most of this is in the resolve phase # Prompt and create actions. Most of this is in the resolve phase
# already, but we can't handle .hgsubstate in filemerge or # already, but we can't handle .hgsubstate in filemerge or
# subrepoutil.submerge yet so we have to keep prompting for it. # subrepoutil.submerge yet so we have to keep prompting for it.
# Convert to dictionary-of-lists format # Convert to dictionary-of-lists format
actions = emptyactions() actions = emptyactions()
for f, (m, args, msg) in pycompat.iteritems(actionbyfile): for f, (m, args, msg) in pycompat.iteritems(actionbyfile):
if m not in actions: if m not in actions:
actions[m] = [] actions[m] = []
actions[m].append((f, args, msg)) actions[m].append((f, args, msg))
# ACTION_GET_OTHER_AND_STORE is a ACTION_GET + store in mergestate
for e in actions[ACTION_GET_OTHER_AND_STORE]:
actions[ACTION_GET].append(e)
if not util.fscasesensitive(repo.path): if not util.fscasesensitive(repo.path):
# check collision between files only in p2 for clean update # check collision between files only in p2 for clean update
if not branchmerge and ( if not branchmerge and (
force or not wc.dirty(missing=True, branch=False) force or not wc.dirty(missing=True, branch=False)
): ):
_checkcollision(repo, p2.manifest(), None) _checkcollision(repo, p2.manifest(), None)
else: else:
_checkcollision(repo, wc.manifest(), actions) _checkcollision(repo, wc.manifest(), actions)

tests/test-convert-hg-source.t

scanning source... scanning source...
sorting... sorting...
converting... converting...
8 add foo bar 8 add foo bar
7 change foo 7 change foo
6 make bar and baz copies of foo 6 make bar and baz copies of foo
5 merge local copy 5 merge local copy
4 merge remote copy 4 merge remote copy
3 Added tag that for changeset 88586c4e9f02 3 Added tag that for changeset 8601262d7472
2 Removed tag that 2 Removed tag that
1 Added tag this for changeset c56a7f387039 1 Added tag this for changeset 706614b458c1
0 mark baz executable 0 mark baz executable
updating bookmarks updating bookmarks
$ cd new $ cd new
$ hg out ../orig $ hg out ../orig
comparing with ../orig comparing with ../orig
searching for changes searching for changes
no changes found no changes found
[1] [1]
#if execbit #if execbit
$ hg bookmarks $ hg bookmarks
premerge1 3:973ef48a98a4 premerge1 3:973ef48a98a4
premerge2 8:91d107c423ba premerge2 8:c4968fdf2e5d
#else #else
Different hash because no x bit Different hash because no x bit
$ hg bookmarks $ hg bookmarks
premerge1 3:973ef48a98a4 premerge1 3:973ef48a98a4
premerge2 8:3537b15eaaca premerge2 8:3537b15eaaca
#endif #endif
Test that redoing a convert results in an identical graph Test that redoing a convert results in an identical graph
$ cd ../ $ cd ../
$ rm new/.hg/shamap $ rm new/.hg/shamap
$ hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' $ hg convert --datesort orig new 2>&1 | grep -v 'subversion python bindings could not be loaded'
scanning source... scanning source...
sorting... sorting...
converting... converting...
8 add foo bar 8 add foo bar
7 change foo 7 change foo
6 make bar and baz copies of foo 6 make bar and baz copies of foo
5 merge local copy 5 merge local copy
4 merge remote copy 4 merge remote copy
3 Added tag that for changeset 88586c4e9f02 3 Added tag that for changeset 8601262d7472
2 Removed tag that 2 Removed tag that
1 Added tag this for changeset c56a7f387039 1 Added tag this for changeset 706614b458c1
0 mark baz executable 0 mark baz executable
updating bookmarks updating bookmarks
$ hg -R new log -G -T '{rev} {desc}' $ hg -R new log -G -T '{rev} {desc}'
o 8 mark baz executable o 8 mark baz executable
| |
o 7 Added tag this for changeset c56a7f387039 o 7 Added tag this for changeset 706614b458c1
| |
o 6 Removed tag that o 6 Removed tag that
| |
o 5 Added tag that for changeset 88586c4e9f02 o 5 Added tag that for changeset 8601262d7472
| |
o 4 merge remote copy o 4 merge remote copy
|\ |\
+---o 3 merge local copy +---o 3 merge local copy
| |/ | |/
| o 2 make bar and baz copies of foo | o 2 make bar and baz copies of foo
| | | |
o | 1 change foo o | 1 change foo

tests/test-copies-chain-merge.t

Comparing with a merge re-adding the file afterward Comparing with a merge re-adding the file afterward
--------------------------------------------------- ---------------------------------------------------
Merge: Merge:
- one with change to an unrelated file - one with change to an unrelated file
- one deleting and recreating the change - one deleting and recreating the change
Note: Note:
| In this case, one of the merge wrongly record a merge while there is none. | In this case, one of the merge wrongly record a merge while there is none.
| This lead to bad copy tracing information to be dug up. | This lead to bad copy tracing information to be dug up.
martinvonzUnsubmitted
Not Done

Could you send a follow-up updating this?

martinvonz: Could you send a follow-up updating this?
$ hg up 'desc("b-1")' $ hg up 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("d-2")' $ hg merge 'desc("d-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 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)
$ hg ci -m 'mBDm-0 simple merge - one way' $ hg ci -m 'mBDm-0 simple merge - one way'
$ hg up 'desc("d-2")' $ hg up 'desc("d-2")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("b-1")' $ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 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)
$ hg ci -m 'mDBm-0 simple merge - the other way' $ hg ci -m 'mDBm-0 simple merge - the other way'
created new head created new head
$ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))' $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))'
@ 18 mDBm-0 simple merge - the other way @ 18 mDBm-0 simple merge - the other way
|\ |\
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h
$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBDm-0")' $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBDm-0")'
M d M d
$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mDBm-0")' $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mDBm-0")'
M d M d
$ hg status --copies --rev 'desc("d-2")' --rev 'desc("mBDm-0")' $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mBDm-0")'
M b M b
M d
$ hg status --copies --rev 'desc("d-2")' --rev 'desc("mDBm-0")' $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mDBm-0")'
M b M b
$ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBDm-0")' $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mBDm-0")'
M b M b
M d M d
$ hg status --copies --rev 'desc("i-2")' --rev 'desc("mDBm-0")' $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mDBm-0")'
M b M b
M d M d
The bugs makes recorded copy is different depending of where we started the merge from since The bugs makes recorded copy is different depending of where we started the merge from since
$ hg manifest --debug --rev 'desc("mBDm-0")' | grep '644 d' $ hg manifest --debug --rev 'desc("mBDm-0")' | grep '644 d'
0bb5445dc4d02f4e0d86cf16f9f3a411d0f17744 644 d b004912a8510032a0350a74daa2803dadfb00e12 644 d
$ hg manifest --debug --rev 'desc("mDBm-0")' | grep '644 d' $ hg manifest --debug --rev 'desc("mDBm-0")' | grep '644 d'
b004912a8510032a0350a74daa2803dadfb00e12 644 d b004912a8510032a0350a74daa2803dadfb00e12 644 d
The 0bb5445dc4d02f4e0d86cf16f9f3a411d0f17744 entry is wrong, since the file was The 0bb5445dc4d02f4e0d86cf16f9f3a411d0f17744 entry is wrong, since the file was
martinvonzUnsubmitted
Not Done

The hash no longer exists, and maybe it's no longer wrong?

martinvonz: The hash no longer exists, and maybe it's no longer wrong?
deleted on one side (then recreate) and untouched on the other side, no "merge" deleted on one side (then recreate) and untouched on the other side, no "merge"
has happened. The resulting `d` file is the untouched version from branch `D`, has happened. The resulting `d` file is the untouched version from branch `D`,
not a merge. not a merge.
$ hg manifest --debug --rev 'desc("d-2")' | grep '644 d' $ hg manifest --debug --rev 'desc("d-2")' | grep '644 d'
b004912a8510032a0350a74daa2803dadfb00e12 644 d b004912a8510032a0350a74daa2803dadfb00e12 644 d
$ hg manifest --debug --rev 'desc("b-1")' | grep '644 d' $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d'
01c2f5eabdc4ce2bdee42b5f86311955e6c8f573 644 d 01c2f5eabdc4ce2bdee42b5f86311955e6c8f573 644 d
$ hg debugindex d $ hg debugindex d
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 2 01c2f5eabdc4 000000000000 000000000000 0 2 01c2f5eabdc4 000000000000 000000000000
1 8 b004912a8510 000000000000 000000000000 1 8 b004912a8510 000000000000 000000000000
2 17 0bb5445dc4d0 01c2f5eabdc4 b004912a8510
(This `hg log` output if wrong, since no merge actually happened). (This `hg log` output if wrong, since no merge actually happened).
martinvonzUnsubmitted
Not Done

And I don't think this is wrong anymore (i.e. the comment is now wrong)

martinvonz: And I don't think this is wrong anymore (i.e. the comment is now wrong)
$ hg log -Gfr 'desc("mBDm-0")' d $ hg log -Gfr 'desc("mBDm-0")' d
o 17 mBDm-0 simple merge - one way o 8 d-2 re-add d
|\
o : 8 d-2 re-add d
:/
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h ~
This `hg log` output is correct This `hg log` output is correct
martinvonzUnsubmitted
Not Done

Would be clearer to update this too. Either simply delete it or say what it should show in order to be correct (e.g. "log output should not include the merge commit").

martinvonz: Would be clearer to update this too. Either simply delete it or say what it should show in…
$ hg log -Gfr 'desc("mDBm-0")' d $ hg log -Gfr 'desc("mDBm-0")' d
o 8 d-2 re-add d o 8 d-2 re-add d
| |
~ ~
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBDm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBDm-0")'
M b M b
A d A d
a
R a R a
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDBm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDBm-0")'
M b M b
A d A d
R a R a
Comparing with a merge with colliding rename Comparing with a merge with colliding rename
$ hg commit -m "f-1: rename h -> i" $ hg commit -m "f-1: rename h -> i"
created new head created new head
$ hg mv --force i d $ hg mv --force i d
$ hg commit -m "f-2: rename i -> d" $ hg commit -m "f-2: rename i -> d"
$ hg debugindex d $ hg debugindex d
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 2 01c2f5eabdc4 000000000000 000000000000 0 2 01c2f5eabdc4 000000000000 000000000000
1 8 b004912a8510 000000000000 000000000000 1 8 b004912a8510 000000000000 000000000000
2 17 0bb5445dc4d0 01c2f5eabdc4 b004912a8510 2 22 c72365ee036f 000000000000 000000000000
3 22 c72365ee036f 000000000000 000000000000
$ hg up 'desc("b-1")' $ hg up 'desc("b-1")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("f-2")' $ hg merge 'desc("f-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'mBFm-0 simple merge - one way' $ hg ci -m 'mBFm-0 simple merge - one way'
$ hg up 'desc("f-2")' $ hg up 'desc("f-2")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("b-1")' $ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 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)
$ hg ci -m 'mFBm-0 simple merge - the other way' $ hg ci -m 'mFBm-0 simple merge - the other way'
created new head created new head
$ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))' $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'
@ 24 mFBm-0 simple merge - the other way @ 24 mFBm-0 simple merge - the other way
|\ |\
+---o 23 mBFm-0 simple merge - one way +---o 23 mBFm-0 simple merge - one way
| |/ | |/
| o 22 f-2: rename i -> d | o 22 f-2: rename i -> d
| | | |
| o 21 f-1: rename h -> i | o 21 f-1: rename h -> i
| | | |
o | 5 b-1: b update o | 5 b-1: b update
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h
The overwriting should take over. However, the behavior is currently buggy The overwriting should take over. However, the behavior is currently buggy
martinvonzUnsubmitted
Not Done

Is this still true?

martinvonz: Is this still true?
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")'
M b M b
A d A d
a (true !) h
h (false !) h (false !)
martinvonzUnsubmitted
Not Done

delete

martinvonz: delete
R a R a
R h R h
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFBm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFBm-0")'
M b M b
A d A d
h h
R a R a
R h R h
$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBFm-0")' $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBFm-0")'
M d M d
R h R h
$ hg status --copies --rev 'desc("f-2")' --rev 'desc("mBFm-0")' $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mBFm-0")'
M b M b
M d
$ hg status --copies --rev 'desc("f-1")' --rev 'desc("mBFm-0")' $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mBFm-0")'
M b M b
M d M d
R i R i
$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mFBm-0")' $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mFBm-0")'
M d M d
R h R h
$ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFBm-0")' $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFBm-0")'
M b M b
$ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFBm-0")' $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFBm-0")'
M b M b
M d M d
R i R i
The following graphlog is wrong, the "a -> c -> d" chain was overwritten and should not appear. The following graphlog is wrong, the "a -> c -> d" chain was overwritten and should not appear.
martinvonzUnsubmitted
Not Done

And this comment also seems wrong now

martinvonz: And this comment also seems wrong now
$ hg log -Gfr 'desc("mBFm-0")' d $ hg log -Gfr 'desc("mBFm-0")' d
o 23 mBFm-0 simple merge - one way o 22 f-2: rename i -> d
|\
o : 22 f-2: rename i -> d
| :
o : 21 f-1: rename h -> i
:/
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
| |
o 21 f-1: rename h -> i
:
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h
The following output is correct. The following output is correct.
martinvonzUnsubmitted
Not Done

As above, delete to clarify

martinvonz: As above, delete to clarify
$ hg log -Gfr 'desc("mFBm-0")' d $ hg log -Gfr 'desc("mFBm-0")' d
o 22 f-2: rename i -> d o 22 f-2: rename i -> d
| |
o 21 f-1: rename h -> i o 21 f-1: rename h -> i
: :
o 0 i-0 initial commit: a b h o 0 i-0 initial commit: a b h