Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 2848:e78cad1f6b1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge manifest refactor work
author Matt Mackall <mpm@selenic.com>
date Wed, 09 Aug 2006 15:03:46 -0500
parents 3aeab7bb5adc e196aa1df169
children 046a8b03ea59
comparison
equal deleted inserted replaced
2830:49988d9f0758 2848:e78cad1f6b1f
2149 mf = repo.manifest.readflags(n) 2149 mf = repo.manifest.readflags(n)
2150 files = m.keys() 2150 files = m.keys()
2151 files.sort() 2151 files.sort()
2152 2152
2153 for f in files: 2153 for f in files:
2154 ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f)) 2154 ui.write("%40s %3s %s\n" % (hex(m[f]),
2155 mf.execf(f) and "755" or "644", f))
2155 2156
2156 def merge(ui, repo, node=None, force=None, branch=None): 2157 def merge(ui, repo, node=None, force=None, branch=None):
2157 """Merge working directory with another revision 2158 """Merge working directory with another revision
2158 2159
2159 Merge the contents of the current working directory and the 2160 Merge the contents of the current working directory and the