equal
deleted
inserted
replaced
370 diff --git a/c b/wat |
370 diff --git a/c b/wat |
371 rename from c |
371 rename from c |
372 rename to wat |
372 rename to wat |
373 $ hg revert -qa |
373 $ hg revert -qa |
374 $ rm foobar wat |
374 $ rm foobar wat |
|
375 |
|
376 Rename a->b, then amend b->c. After unamend, should look like b->c. |
|
377 |
|
378 $ hg co -q 0 |
|
379 $ hg mv a b |
|
380 $ hg ci -qm 'move to a b' |
|
381 $ hg mv b c |
|
382 $ hg amend |
|
383 $ hg unamend |
|
384 $ hg st --copies --change . |
|
385 A b |
|
386 a |
|
387 R a |
|
388 BROKEN: should indicate that b was renamed to c |
|
389 $ hg st --copies |
|
390 A c |
|
391 R b |
|
392 $ hg revert -qa |
|
393 $ rm c |
|
394 |
|
395 Rename a->b, then amend b->c, and working copy change c->d. After unamend, should look like b->d |
|
396 |
|
397 $ hg co -q 0 |
|
398 $ hg mv a b |
|
399 $ hg ci -qm 'move to a b' |
|
400 $ hg mv b c |
|
401 $ hg amend |
|
402 $ hg mv c d |
|
403 $ hg unamend |
|
404 $ hg st --copies --change . |
|
405 A b |
|
406 a |
|
407 R a |
|
408 BROKEN: should indicate that b was renamed to d |
|
409 $ hg st --copies |
|
410 A d |
|
411 R b |