Show More
@@ -843,7 +843,7 b' class workingctx(changectx):' | |||||
843 | if self._repo.dirstate[f] != 'r': |
|
843 | if self._repo.dirstate[f] != 'r': | |
844 | self._repo.ui.warn(_("%s not removed!\n") % f) |
|
844 | self._repo.ui.warn(_("%s not removed!\n") % f) | |
845 | else: |
|
845 | else: | |
846 | fctx = f in pctxs[0] and pctxs[0] or pctxs[1] |
|
846 | fctx = f in pctxs[0] and pctxs[0][f] or pctxs[1][f] | |
847 | t = fctx.data() |
|
847 | t = fctx.data() | |
848 | self._repo.wwrite(f, t, fctx.flags()) |
|
848 | self._repo.wwrite(f, t, fctx.flags()) | |
849 | self._repo.dirstate.normal(f) |
|
849 | self._repo.dirstate.normal(f) |
@@ -36,4 +36,18 b' hg qrename y' | |||||
36 | hg qcommit -m rename |
|
36 | hg qcommit -m rename | |
37 | cd .. |
|
37 | cd .. | |
38 |
|
38 | |||
39 |
|
39 | echo '% test overlapping renames (issue2388)' | ||
|
40 | hg init c | |||
|
41 | cd c | |||
|
42 | hg qinit -c | |||
|
43 | echo a > a | |||
|
44 | hg add | |||
|
45 | hg qnew patcha | |||
|
46 | echo b > b | |||
|
47 | hg add | |||
|
48 | hg qnew patchb | |||
|
49 | hg ci --mq -m c1 | |||
|
50 | hg qrename patchb patchc | |||
|
51 | hg qrename patcha patchb | |||
|
52 | hg st --mq | |||
|
53 | cd .. No newline at end of file |
General Comments 0
You need to be logged in to leave comments.
Login now