Show More
@@ -784,7 +784,16 b' class localrepository(repo.repository):' | |||||
784 | self.ui.note(f + "\n") |
|
784 | self.ui.note(f + "\n") | |
785 | try: |
|
785 | try: | |
786 | new[f] = self.filecommit(f, m1, m2, linkrev, tr, changed) |
|
786 | new[f] = self.filecommit(f, m1, m2, linkrev, tr, changed) | |
787 |
|
|
787 | new_exec = is_exec(f) | |
|
788 | new_link = is_link(f) | |||
|
789 | if not changed or changed[-1] != f: | |||
|
790 | # mention the file in the changelog if some flag changed, | |||
|
791 | # even if there was no content change. | |||
|
792 | old_exec = m1.execf(f) | |||
|
793 | old_link = m1.linkf(f) | |||
|
794 | if old_exec != new_exec or old_link != new_link: | |||
|
795 | changed.append(f) | |||
|
796 | m1.set(f, new_exec, new_link) | |||
788 | except (OSError, IOError): |
|
797 | except (OSError, IOError): | |
789 | if use_dirstate: |
|
798 | if use_dirstate: | |
790 | self.ui.warn(_("trouble committing %s!\n") % f) |
|
799 | self.ui.warn(_("trouble committing %s!\n") % f) |
@@ -19,6 +19,8 b' hg pull ../test1' | |||||
19 | hg co |
|
19 | hg co | |
20 | chmod +x a |
|
20 | chmod +x a | |
21 | hg ci -m "chmod +x a" -d "1000000 0" |
|
21 | hg ci -m "chmod +x a" -d "1000000 0" | |
|
22 | echo % the changelog should mention file a: | |||
|
23 | hg tip --template '#files#\n' | |||
22 |
|
24 | |||
23 | cd ../test1 |
|
25 | cd ../test1 | |
24 | echo 123 >>a |
|
26 | echo 123 >>a |
@@ -7,6 +7,8 b' adding file changes' | |||||
7 | added 1 changesets with 2 changes to 2 files |
|
7 | added 1 changesets with 2 changes to 2 files | |
8 | (run 'hg update' to get a working copy) |
|
8 | (run 'hg update' to get a working copy) | |
9 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
10 | % the changelog should mention file a: | |||
|
11 | a | |||
10 | pulling from ../test2 |
|
12 | pulling from ../test2 | |
11 | searching for changes |
|
13 | searching for changes | |
12 | adding changesets |
|
14 | adding changesets |
General Comments 0
You need to be logged in to leave comments.
Login now