upstream/mercurial-mirror Files · mercurial/templates/static

log: include unmodified-in-merge files in log diff/stat (issue2383)...

log: include unmodified-in-merge files in log diff/stat (issue2383) assumed that walkchangerevs called prep with all relevant matched filenames, but actually it only contains the names of files changed in the relevant changeset. That meant that log diff/stat of merges missed the diff for files only changed in the other branch. This is a minimal fix for making sure we only use fns when we are following and thus will have problems with merges anyway ...

Mads Kiilerich -


            r12382:28ddf671

stable

Name	Size	Modified	Last Commit	Author
/ mercurial / templates / static
background.png	Loading ...
coal-file.png	Loading ...
coal-folder.png	Loading ...
excanvas.js	Loading ...
graph.js	Loading ...
hgicon.png	Loading ...
hglogo.png	Loading ...
style-coal.css	Loading ...
style-gitweb.css	Loading ...
style-monoblue.css	Loading ...
style-paper.css	Loading ...
style.css	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