Mercurial > hg-stable
diff mercurial/commands.py @ 2836:e78cad1f6b1f
Merge manifest refactor work
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 09 Aug 2006 15:03:46 -0500 |
parents | 3aeab7bb5adc e196aa1df169 |
children | 046a8b03ea59 |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Aug 09 13:55:18 2006 -0500 +++ b/mercurial/commands.py Wed Aug 09 15:03:46 2006 -0500 @@ -2151,7 +2151,8 @@ files.sort() for f in files: - ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f)) + ui.write("%40s %3s %s\n" % (hex(m[f]), + mf.execf(f) and "755" or "644", f)) def merge(ui, repo, node=None, force=None, branch=None): """Merge working directory with another revision