equal
deleted
inserted
replaced
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 |