upstream/mercurial-mirror Files · mercurial/utils

copies: distinguish between merged and touched files during upgrade...

copies: distinguish between merged and touched files during upgrade This a filenode being different between p1, p2 and result does not necessarily means a merges happens. For example p2 could be a strict newer version of p1, so the p2 version is picked by the manifest merging, but then the file is manually updated before the commit. In this case the file should be detected as touched. Differential Revision: https://phab.mercurial-scm.org/D10220

marmoute -


            r47571:433cef8f

default

Name	Size	Modified	Last Commit	Author
/ mercurial / utils
__init__.py	Loading ...
cborutil.py	Loading ...
compression.py	Loading ...
dateutil.py	Loading ...
hashutil.py	Loading ...
memorytop.py	Loading ...
procutil.py	Loading ...
repoviewutil.py	Loading ...
resourceutil.py	Loading ...
storageutil.py	Loading ...
stringutil.py	Loading ...

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages