##// END OF EJS Templates
histedit: use stable iteration order for processing bookmarks...
Mads Kiilerich -
r17084:69dae798 default
parent child Browse files
Show More
@@ -476,7 +476,7 b' def histedit(ui, repo, *parent, **opts):'
476 476 newtip = sorted(replacemap.values(), key=repo.changelog.rev)[-1]
477 477 copybms(oldtip, newtip)
478 478
479 for old, new in replacemap.iteritems():
479 for old, new in sorted(replacemap.iteritems()):
480 480 copybms(old, new)
481 481 # TODO update mq state
482 482
@@ -87,14 +87,14 b''
87 87 histedit: Should update metadata for the following changes:
88 88 histedit: 055a42cdd887 to ae467701c500
89 89 histedit: moving bookmarks three
90 histedit: 177f92b77385 to d36c0562f908
91 histedit: moving bookmarks also-two, two
90 92 histedit: 652413bf663e to 0efacef7cb48
91 93 histedit: moving bookmarks five
92 94 histedit: d2ae7f538514 to cb9a9f314b8b
93 95 histedit: moving bookmarks will-move-backwards
94 96 histedit: e860deea161a to ae467701c500
95 97 histedit: moving bookmarks four
96 histedit: 177f92b77385 to d36c0562f908
97 histedit: moving bookmarks also-two, two
98 98 saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-backup.hg
99 99 saved backup bundle to $TESTTMP/r/.hg/strip-backup/34a9919932c1-backup.hg
100 100 $ hg log --graph
@@ -149,9 +149,9 b''
149 149 histedit: Should update metadata for the following changes:
150 150 histedit: 0efacef7cb48 to 1be9c35b4cb2
151 151 histedit: moving bookmarks five
152 histedit: 0efacef7cb48 to 7c044e3e33a9
152 153 histedit: ae467701c500 to 1be9c35b4cb2
153 154 histedit: moving bookmarks four, three
154 histedit: 0efacef7cb48 to 7c044e3e33a9
155 155 saved backup bundle to $TESTTMP/r/.hg/strip-backup/ae467701c500-backup.hg
156 156
157 157 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