Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/filemerge.py @ 8861:90f74b31ed4f
filemerge: fix internal:dump
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 20 Jun 2009 16:42:51 -0500 |
| parents | 91e26fb24fb1 |
| children | 86b4a9b0ddda |
comparison
equal
deleted
inserted
replaced
| 8860:36654238c050 | 8861:90f74b31ed4f |
|---|---|
| 193 if tool == "internal:merge": | 193 if tool == "internal:merge": |
| 194 r = simplemerge.simplemerge(ui, a, b, c, label=['local', 'other']) | 194 r = simplemerge.simplemerge(ui, a, b, c, label=['local', 'other']) |
| 195 elif tool == 'internal:dump': | 195 elif tool == 'internal:dump': |
| 196 a = repo.wjoin(fd) | 196 a = repo.wjoin(fd) |
| 197 util.copyfile(a, a + ".local") | 197 util.copyfile(a, a + ".local") |
| 198 repo.wwrite(a + ".other", fco.data(), fco.flags()) | 198 repo.wwrite(fd + ".other", fco.data(), fco.flags()) |
| 199 repo.wwrite(a + ".base", fca.data(), fca.flags()) | 199 repo.wwrite(fd + ".base", fca.data(), fca.flags()) |
| 200 return 1 # unresolved | 200 return 1 # unresolved |
| 201 else: | 201 else: |
| 202 args = _toolstr(ui, tool, "args", '$local $base $other') | 202 args = _toolstr(ui, tool, "args", '$local $base $other') |
| 203 if "$output" in args: | 203 if "$output" in args: |
| 204 out, a = a, back # read input from backup, write to original | 204 out, a = a, back # read input from backup, write to original |