##// END OF EJS Templates
rebase: restore active bookmark after rebase --continue...
rebase: restore active bookmark after rebase --continue When a rebase has conflicts and the user uses rebase --continue, the previously active bookmark was not being made active once again. With this change that bookmark is made active again, just as if the rebase had never been interrupted. This changes the rebasestate file format, but should handle old formats correctly. Since the file is transient, this is even less of a problem. Adds a test to verify the new behavior. I manually tested continuing rebases with and without an active bookmark, and with and without being on the bookmark being rebased.

File last commit:

r16339:6e738a0a stable
r18755:72412afe stable
Show More
linux-vfat
35 lines | 638 B | text/plain | TextLexer
# invalid filenames
test-add.t
test-init.t
test-clone.t
test-contrib.t
test-hgweb-raw.t
test-walk.t
# no sockets or fifos
test-hup.t
test-inotify-debuginotify.t
test-inotify-dirty-dirstate.t
test-inotify-issue1208.t
test-inotify-issue1371.t
test-inotify-issue1542.t
test-inotify-lookup.t
test-inotify.t
test-inotify-issue1556.t
# no hardlinks
test-hardlinks.t
test-relink.t
# exec bit problems
test-convert-bzr-114.t
test-convert-bzr-directories.t
test-convert-bzr-merges.t
test-convert-bzr-treeroot.t
test-convert-darcs.t
test-merge-tools.t
# debugstate exec bit false positives
test-dirstate.t
test-filebranch.t
test-merge-remove.t