##// END OF EJS Templates
merge: first part of fix for issue1327...
merge: first part of fix for issue1327 When there are no renames involved, we shortcut to the changeset ancestor. This resolves most cases. Note that Mercurial's rename philosophy elsewhere is that a file's name is signficant and rename data is only consulted when a file of the same name is absent.
Matt Mackall -
r9750:f153af95 default
Show More
Name Size Modified Last Commit Author
/ mercurial
hgweb
pure
__init__.py Loading ...
ancestor.py Loading ...
archival.py Loading ...
base85.c Loading ...
bdiff.c Loading ...
bundlerepo.py Loading ...
byterange.py Loading ...
changegroup.py Loading ...
changelog.py Loading ...
cmdutil.py Loading ...
commands.py Loading ...
config.py Loading ...
context.py Loading ...
copies.py Loading ...
demandimport.py Loading ...
diffhelpers.c Loading ...
dirstate.py Loading ...
dispatch.py Loading ...
encoding.py Loading ...
error.py Loading ...
extensions.py Loading ...
fancyopts.py Loading ...
filelog.py Loading ...
filemerge.py Loading ...
graphmod.py Loading ...
hbisect.py Loading ...
help.py Loading ...
hg.py Loading ...
hook.py Loading ...
httprepo.py Loading ...
i18n.py Loading ...
ignore.py Loading ...
keepalive.py Loading ...
localrepo.py Loading ...
lock.py Loading ...
lsprof.py Loading ...
lsprofcalltree.py Loading ...
mail.py Loading ...
manifest.py Loading ...
match.py Loading ...
mdiff.py Loading ...
merge.py Loading ...
minirst.py Loading ...
mpatch.c Loading ...
node.py Loading ...
osutil.c Loading ...
parsers.c Loading ...
patch.py Loading ...
posix.py Loading ...
repair.py Loading ...
repo.py Loading ...
revlog.py Loading ...
simplemerge.py Loading ...
sshrepo.py Loading ...
sshserver.py Loading ...
statichttprepo.py Loading ...
store.py Loading ...
streamclone.py Loading ...
strutil.py Loading ...
subrepo.py Loading ...
tags.py Loading ...
templatefilters.py Loading ...
templater.py Loading ...
transaction.py Loading ...
ui.py Loading ...
url.py Loading ...
util.py Loading ...
verify.py Loading ...
win32.py Loading ...
windows.py Loading ...