Show More
@@ -718,3 +718,43 b' issue5960: this was raising an Attribute' | |||
|
718 | 718 | diff --git a/foo.txt b/foo.txt |
|
719 | 719 | old mode 100644 |
|
720 | 720 | new mode 100755 |
|
721 | ||
|
722 | Test rebasing a commit with copy information, but no content changes | |
|
723 | ||
|
724 | $ cd .. | |
|
725 | $ hg clone -q repo1 merge-and-rename | |
|
726 | $ cd merge-and-rename | |
|
727 | $ cat << EOF >> .hg/hgrc | |
|
728 | > [experimental] | |
|
729 | > evolution.createmarkers=True | |
|
730 | > evolution.allowunstable=True | |
|
731 | > EOF | |
|
732 | $ hg co -q 1 | |
|
733 | $ hg mv d e | |
|
734 | $ hg ci -qm 'rename d to e' | |
|
735 | $ hg co -q 3 | |
|
736 | $ hg merge -q 4 | |
|
737 | $ hg ci -m 'merge' | |
|
738 | $ hg co -q 2 | |
|
739 | $ mv d e | |
|
740 | $ hg addremove -qs 0 | |
|
741 | $ hg ci -qm 'untracked rename of d to e' | |
|
742 | $ hg debugobsolete -q `hg log -T '{node}' -r 4` `hg log -T '{node}' -r .` | |
|
743 | 1 new orphan changesets | |
|
744 | $ hg tglog | |
|
745 | @ 6: 676538af172d 'untracked rename of d to e' | |
|
746 | | | |
|
747 | | * 5: 71cb43376053 'merge' | |
|
748 | | |\ | |
|
749 | | | x 4: 2c8b5dad7956 'rename d to e' | |
|
750 | | | | | |
|
751 | | o | 3: ca58782ad1e4 'b' | |
|
752 | |/ / | |
|
753 | o / 2: 814f6bd05178 'c' | |
|
754 | |/ | |
|
755 | o 1: 02952614a83d 'd' | |
|
756 | | | |
|
757 | o 0: b173517d0057 'a' | |
|
758 | ||
|
759 | $ hg rebase -b 5 -d tip 2>&1 | grep '** ProgrammingError' | |
|
760 | ** ProgrammingError: markcopied() called on clean context |
General Comments 0
You need to be logged in to leave comments.
Login now