Mercurial > hg
comparison tests/test-rename-merge1.t @ 16794:98687cdddcb1
merge: warn about file deleted in one branch and renamed in other (issue3074)
For divergent renames the following message is printed during merge:
note: possible conflict - file was renamed multiple times to:
newfile
file2
When a file is renamed in one branch and deleted in the other, the file still
exists after a merge. With this change a similar message is printed for mv+rm:
note: possible conflict - file was deleted and renamed to:
newfile
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 23 May 2012 20:50:16 +0200 |
parents | 9cbc44a6600e |
children | e9ae770eff1c |
comparison
equal
deleted
inserted
replaced
16793:9cbc44a6600e | 16794:98687cdddcb1 |
---|---|
154 | 154 |
155 $ cat f2 | 155 $ cat f2 |
156 c2 | 156 c2 |
157 | 157 |
158 $ cd .. | 158 $ cd .. |
159 | |
160 Check for issue3074 | |
161 | |
162 $ hg init repo3074 | |
163 $ cd repo3074 | |
164 $ echo foo > file | |
165 $ hg add file | |
166 $ hg commit -m "added file" | |
167 $ hg mv file newfile | |
168 $ hg commit -m "renamed file" | |
169 $ hg update 0 | |
170 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
171 $ hg rm file | |
172 $ hg commit -m "deleted file" | |
173 created new head | |
174 $ hg merge | |
175 note: possible conflict - file was deleted and renamed to: | |
176 newfile | |
177 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
178 (branch merge, don't forget to commit) | |
179 $ hg status | |
180 M newfile | |
181 $ cd .. |