Show More
@@ -538,7 +538,7 b' class workingctx(changectx):' | |||||
538 | is_exec = util.execfunc(self._repo.root, |
|
538 | is_exec = util.execfunc(self._repo.root, | |
539 | lambda p: flag and 'x' in flag) |
|
539 | lambda p: flag and 'x' in flag) | |
540 | try: |
|
540 | try: | |
541 |
return (is_link(path) and 'l' or '') + (is_exec(path) and ' |
|
541 | return (is_link(path) and 'l' or '') + (is_exec(path) and 'x' or '') | |
542 | except OSError: |
|
542 | except OSError: | |
543 | pass |
|
543 | pass | |
544 |
|
544 |
@@ -186,6 +186,8 b' class dirstate(object):' | |||||
186 | self._dirty = False |
|
186 | self._dirty = False | |
187 |
|
187 | |||
188 | def copy(self, source, dest): |
|
188 | def copy(self, source, dest): | |
|
189 | if source == dest: | |||
|
190 | return | |||
189 | self._dirty = True |
|
191 | self._dirty = True | |
190 | self._copymap[dest] = source |
|
192 | self._copymap[dest] = source | |
191 |
|
193 |
@@ -695,7 +695,7 b' class localrepository(repo.repository):' | |||||
695 |
|
695 | |||
696 | meta = {} |
|
696 | meta = {} | |
697 | cp = self.dirstate.copied(fn) |
|
697 | cp = self.dirstate.copied(fn) | |
698 | if cp: |
|
698 | if cp and cp != fn: | |
699 | # Mark the new revision of this file as a copy of another |
|
699 | # Mark the new revision of this file as a copy of another | |
700 | # file. This copy data will effectively act as a parent |
|
700 | # file. This copy data will effectively act as a parent | |
701 | # of this new revision. If this is a merge, the first |
|
701 | # of this new revision. If this is a merge, the first |
@@ -117,7 +117,7 b' o branch=old3 11 branch trunk@1 into ol' | |||||
117 | | | | |
|
117 | | | | | |
118 | | o | branch= 3 change a files: a |
|
118 | | o | branch= 3 change a files: a | |
119 | | | | |
|
119 | | | | | |
120 |
| | o branch=old 2 branch trunk, remove c files: |
|
120 | | | o branch=old 2 branch trunk, remove c files: | |
121 | | |/ |
|
121 | | |/ | |
122 | | o branch= 1 hello files: a b c |
|
122 | | o branch= 1 hello files: a b c | |
123 | |/ |
|
123 | |/ |
General Comments 0
You need to be logged in to leave comments.
Login now