Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make status -C work with merge+rename
authorMatt Mackall <mpm@selenic.com>
Wed, 04 Oct 2006 17:59:27 -0500
changeset 3250 7c114915fbdb
parent 3249 f05c182430a0
child 3251 c93ce7f10f85
Make status -C work with merge+rename
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Wed Oct 04 15:43:27 2006 -0500
+++ b/mercurial/commands.py	Wed Oct 04 17:59:27 2006 -0500
@@ -2532,8 +2532,7 @@
 
         for f in changes:
             ui.write(format % f)
-            if ((all or opts.get('copies')) and not opts.get('no_status')
-                and opt == 'added'):
+            if ((all or opts.get('copies')) and not opts.get('no_status')):
                 copied = repo.dirstate.copied(f)
                 if copied:
                     ui.write('  %s%s' % (copied, end))
Mercurial