Bug 4382 - chmod during merge doesn't appear in changeset files list
Summary: chmod during merge doesn't appear in changeset files list
Status: RESOLVED FIXED
Alias: None
Product: Mercurial
Classification: Unclassified
Component: Mercurial (show other bugs)
Version: 3.1.1
Hardware: PC Linux
: normal bug
Assignee: Bugzilla
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-09-21 09:31 UTC by Matt Mackall
Modified: 2015-01-22 15:04 UTC (History)
3 users (show)

See Also:
Python Version: ---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Matt Mackall 2014-09-21 09:31 UTC 
Steps:

- perform a merge
- change the exec bit on a file that is unchanged from p1
- commit

..and the file permission will be changed in the manifest, but the file won't be listed in hg log -v or found by hg log --removed.

(Works for chmod on file from p2)
Comment 1 HG Bot 2014-09-22 17:15 UTC 
Fixed by http://selenic.com/repo/hg/rev/d5261db0011f
Matt Mackall <mpm@selenic.com>
commit: catch changed exec bit on files from p1 (issue4382)

(please test the fix)
Comment 2 Matt Mackall 2015-01-22 15:04 UTC 
Bulk testing -> fixed