Added signature for changeset
f37b5a17e6a0
Added tag 2.7 for changeset
f37b5a17e6a0
bookmarks: pull --update updates to active bookmark if it moved (
issue4007)
This makes `hg pull --update` behave the same wrt the active bookmark as
`hg pull && hg update` does as of
2096e025a728. A helper function,
bookmarks.calculateupdate, is added to prevent code duplication between
postincoming and update.
i18n-pt_BR: synchronized with
7b815e38022a
i18n-ja: synchronized with
cfdae231ba78
histedit: don't clobber working copy on --abort if not on histedit cset
Similar to
issue4009, 2.7 will force people to abort histedits before
doing interesting things. Without this fix, people with histedit
sessions they wandered away from before upgrading to 2.7 could clobber
their working copy for no reason.
rebase: allow aborting when descendants detected
With this, all aborts will succeed in removing the state, rather than
leaving the user in 'what do I do now?' limbo.