Mercurial > hg
comparison tests/test-mq-qrename.t @ 23402:2963d5c9d90b stable
rename: properly report removed and added file as modified (issue4458)
The result of 'hg rm' + 'hg rename' disagreed with the one from
'hg rename --force'. We align them on 'hg move --force' because it agrees with
what 'hg status' says after the commit.
Stopping reporting a modified file as added puts an end to the hg revert confusion in this
situation (issue4458).
However, reporting the file as modified also prevents revert from restoring the copy
source. We fix this in a later changeset.
Git diff also stop reporting the add in the middle of the chain as add. Not
sure how important (and even wrong) it is.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Mon, 24 Nov 2014 18:42:56 -0800 |
| parents | 3f948469bac0 |
| children |
comparison
equal
deleted
inserted
replaced
| 23401:fd1bab28a8cc | 23402:2963d5c9d90b |
|---|---|
| 74 $ hg qnew patchb | 74 $ hg qnew patchb |
| 75 $ hg ci --mq -m c1 | 75 $ hg ci --mq -m c1 |
| 76 $ hg qrename patchb patchc | 76 $ hg qrename patchb patchc |
| 77 $ hg qrename patcha patchb | 77 $ hg qrename patcha patchb |
| 78 $ hg st --mq | 78 $ hg st --mq |
| 79 M patchb | |
| 79 M series | 80 M series |
| 80 A patchb | |
| 81 A patchc | 81 A patchc |
| 82 R patcha | 82 R patcha |
| 83 $ cd .. | 83 $ cd .. |
| 84 | 84 |
| 85 Test renames with mq repo (issue2097) | 85 Test renames with mq repo (issue2097) |