Show More
@@ -532,6 +532,15 b' ensure that metadata-only changes are sh' | |||
|
532 | 532 | M a/a |
|
533 | 533 | $ hg revert a/a |
|
534 | 534 | |
|
535 | #else | |
|
536 | ||
|
537 | Dummy shelve op, to keep rev numbers aligned | |
|
538 | ||
|
539 | $ echo foo > a/a | |
|
540 | $ hg shelve -q -n dummy a/a | |
|
541 | $ hg unshelve -q dummy | |
|
542 | $ hg revert a/a | |
|
543 | ||
|
535 | 544 | #endif |
|
536 | 545 | |
|
537 | 546 | #if symlink |
@@ -545,6 +554,15 b' ensure that metadata-only changes are sh' | |||
|
545 | 554 | M a/a |
|
546 | 555 | $ hg revert a/a |
|
547 | 556 | |
|
557 | #else | |
|
558 | ||
|
559 | Dummy shelve op, to keep rev numbers aligned | |
|
560 | ||
|
561 | $ echo bar > a/a | |
|
562 | $ hg shelve -q -n dummy a/a | |
|
563 | $ hg unshelve -q dummy | |
|
564 | $ hg revert a/a | |
|
565 | ||
|
548 | 566 | #endif |
|
549 | 567 | |
|
550 | 568 | set up another conflict between a commit and a shelved change |
General Comments 0
You need to be logged in to leave comments.
Login now