Show More
@@ -804,7 +804,8 b' def docopy(ui, repo, pats, opts):' | |||
|
804 | 804 | |
|
805 | 805 | def okaytocopy(abs, rel, exact): |
|
806 | 806 | reasons = {'?': _('is not managed'), |
|
807 |
'a': _('has been marked for add') |
|
|
807 | 'a': _('has been marked for add'), | |
|
808 | 'r': _('has been marked for remove')} | |
|
808 | 809 | reason = reasons.get(repo.dirstate.state(abs)) |
|
809 | 810 | if reason: |
|
810 | 811 | if exact: |
@@ -152,3 +152,9 b' echo "# move the parent tree with \\"hg r' | |||
|
152 | 152 | (cd d1/d11; hg rename .. ../../d3) |
|
153 | 153 | hg status |
|
154 | 154 | hg update -C |
|
155 | ||
|
156 | echo "# skip removed files" | |
|
157 | hg remove d1/b | |
|
158 | hg rename d1 d3 | |
|
159 | hg status | |
|
160 | hg update -C |
@@ -232,3 +232,17 b' R d1/a' | |||
|
232 | 232 | R d1/b |
|
233 | 233 | R d1/ba |
|
234 | 234 | R d1/d11/a1 |
|
235 | # skip removed files | |
|
236 | copying d1/a to d3/a | |
|
237 | copying d1/ba to d3/ba | |
|
238 | copying d1/d11/a1 to d3/d11/a1 | |
|
239 | removing d1/a | |
|
240 | removing d1/ba | |
|
241 | removing d1/d11/a1 | |
|
242 | A d3/a | |
|
243 | A d3/ba | |
|
244 | A d3/d11/a1 | |
|
245 | R d1/a | |
|
246 | R d1/b | |
|
247 | R d1/ba | |
|
248 | R d1/d11/a1 |
General Comments 0
You need to be logged in to leave comments.
Login now