equal
deleted
inserted
replaced
2024 mf = repo.manifest.readflags(n) |
2024 mf = repo.manifest.readflags(n) |
2025 files = m.keys() |
2025 files = m.keys() |
2026 files.sort() |
2026 files.sort() |
2027 |
2027 |
2028 for f in files: |
2028 for f in files: |
2029 ui.write("%40s %3s %s\n" % (hex(m[f]), mf[f] and "755" or "644", f)) |
2029 ui.write("%40s %3s %s\n" % (hex(m[f]), |
|
2030 mf.execf(f) and "755" or "644", f)) |
2030 |
2031 |
2031 def merge(ui, repo, node=None, **opts): |
2032 def merge(ui, repo, node=None, **opts): |
2032 """Merge working directory with another revision |
2033 """Merge working directory with another revision |
2033 |
2034 |
2034 Merge the contents of the current working directory and the |
2035 Merge the contents of the current working directory and the |