Merge with crew-stable

mercurial/context.py

@@ -538,7 +538,7 b' class workingctx(changectx):'
         is_exec = util.execfunc(self._repo.root,
                                 lambda p: flag and 'x' in flag)
         try:
-            return (is_link(path) and 'l' or '') + (is_exec(path) and 'e' or '')
+            return (is_link(path) and 'l' or '') + (is_exec(path) and 'x' or '')
         except OSError:
             pass
 

mercurial/dirstate.py

@@ -186,6 +186,8 b' class dirstate(object):'
         self._dirty = False
 
     def copy(self, source, dest):
+        if source == dest:
+            return
         self._dirty = True
         self._copymap[dest] = source
 

mercurial/localrepo.py

@@ -695,7 +695,7 b' class localrepository(repo.repository):'
 
         meta = {}
         cp = self.dirstate.copied(fn)
-        if cp:
+        if cp and cp != fn:
             # Mark the new revision of this file as a copy of another
             # file.  This copy data will effectively act as a parent
             # of this new revision.  If this is a merge, the first

tests/test-convert-svn-branches.out

@@ -117,7 +117,7 b' o branch=old3 11 branch trunk@1 into ol'
 | | |
 | o |  branch= 3 change a files: a
 | | |
-| | o  branch=old 2 branch trunk, remove c files: a b
+| | o  branch=old 2 branch trunk, remove c files:
 | |/
 | o  branch= 1 hello files: a b c
 |/