comparison tests/test-convert-cvs-branch.t @ 20523:f2a0a0e76b4c stable

rebase: do not try to reactivate deleted divergent bookmark If the currently active bookmark is divergent one, it may be resolved during rebase. Trying to activate it will raise "KeyError: 'W@diverge'".
author Yuya Nishihara <yuya@tcha.org>
date Sat, 15 Feb 2014 16:19:19 +0900
parents aa9385f983fa
children 7a9cbb315d84
comparison
equal deleted inserted replaced
20490:4e41b2fe46cc 20523:f2a0a0e76b4c