Show More
@@ -695,14 +695,12 b' def movebookmarks(ui, repo, replacemap, ' | |||
|
695 | 695 | return |
|
696 | 696 | while new in replacemap: |
|
697 | 697 | new = replacemap[new] |
|
698 | ui.note(_('histedit: %s to %s\n') % (node.short(old), | |
|
699 | node.short(new))) | |
|
700 | 698 | octx = repo[old] |
|
701 | 699 | marks = octx.bookmarks() |
|
702 | 700 | if marks: |
|
703 | ui.note(_('histedit: moving bookmarks %s\n') % | |
|
704 | ', '.join(marks)) | |
|
705 | 701 | for mark in marks: |
|
702 | ui.note(_('histedit: moving bookmarks %s from %s to %s\n') | |
|
703 | % (mark, octx, node.short(new))) | |
|
706 | 704 | repo._bookmarks[mark] = new |
|
707 | 705 | bookmarks.write(repo) |
|
708 | 706 |
@@ -85,16 +85,12 b'' | |||
|
85 | 85 | > EOF |
|
86 | 86 | $ hg histedit 1 --commands commands.txt --verbose | grep histedit |
|
87 | 87 | histedit: Should update metadata for the following changes: |
|
88 | histedit: 055a42cdd887 to ae467701c500 | |
|
89 | histedit: moving bookmarks three | |
|
90 | histedit: 177f92b77385 to d36c0562f908 | |
|
91 | histedit: moving bookmarks also-two, two | |
|
92 | histedit: 652413bf663e to 0efacef7cb48 | |
|
93 | histedit: moving bookmarks five | |
|
94 | histedit: d2ae7f538514 to cb9a9f314b8b | |
|
95 | histedit: moving bookmarks will-move-backwards | |
|
96 | histedit: e860deea161a to ae467701c500 | |
|
97 | histedit: moving bookmarks four | |
|
88 | histedit: moving bookmarks three from 055a42cdd887 to ae467701c500 | |
|
89 | histedit: moving bookmarks also-two from 177f92b77385 to d36c0562f908 | |
|
90 | histedit: moving bookmarks two from 177f92b77385 to d36c0562f908 | |
|
91 | histedit: moving bookmarks five from 652413bf663e to 0efacef7cb48 | |
|
92 | histedit: moving bookmarks will-move-backwards from d2ae7f538514 to cb9a9f314b8b | |
|
93 | histedit: moving bookmarks four from e860deea161a to ae467701c500 | |
|
98 | 94 | saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-backup.hg (glob) |
|
99 | 95 | saved backup bundle to $TESTTMP/r/.hg/strip-backup/34a9919932c1-backup.hg (glob) |
|
100 | 96 | $ hg log --graph |
@@ -147,11 +143,9 b'' | |||
|
147 | 143 | > EOF |
|
148 | 144 | $ hg histedit 1 --commands commands.txt --verbose | grep histedit |
|
149 | 145 | histedit: Should update metadata for the following changes: |
|
150 | histedit: 0efacef7cb48 to 1be9c35b4cb2 | |
|
151 | histedit: moving bookmarks five | |
|
152 | histedit: 0efacef7cb48 to 7c044e3e33a9 | |
|
153 | histedit: ae467701c500 to 1be9c35b4cb2 | |
|
154 | histedit: moving bookmarks four, three | |
|
146 | histedit: moving bookmarks five from 0efacef7cb48 to 1be9c35b4cb2 | |
|
147 | histedit: moving bookmarks four from ae467701c500 to 1be9c35b4cb2 | |
|
148 | histedit: moving bookmarks three from ae467701c500 to 1be9c35b4cb2 | |
|
155 | 149 | saved backup bundle to $TESTTMP/r/.hg/strip-backup/ae467701c500-backup.hg (glob) |
|
156 | 150 | |
|
157 | 151 | We expect 'five' to stay at tip, since the tipmost bookmark is most |
General Comments 0
You need to be logged in to leave comments.
Login now