Matt Mackall <mpm@selenic.com> [Thu, 01 Aug 2013 22:37:44 -0500] rev 19525
Added signature for changeset f37b5a17e6a0
Matt Mackall <mpm@selenic.com> [Thu, 01 Aug 2013 22:37:41 -0500] rev 19524
Added tag 2.7 for changeset f37b5a17e6a0
Kevin Bullock <kbullock@ringworld.org> [Thu, 01 Aug 2013 21:43:14 -0500] rev 19523
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.
Matt Mackall <mpm@selenic.com> [Thu, 01 Aug 2013 20:06:00 -0500] rev 19522
merge with i18n
Wagner Bruna <wbruna@yahoo.com> [Thu, 01 Aug 2013 02:36:59 -0300] rev 19521
i18n-pt_BR: synchronized with 7b815e38022a
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 01 Aug 2013 04:32:29 +0900] rev 19520
i18n-ja: synchronized with cfdae231ba78
Matt Mackall <mpm@selenic.com> [Thu, 01 Aug 2013 19:55:02 -0500] rev 19519
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.
Matt Mackall <mpm@selenic.com> [Thu, 01 Aug 2013 17:54:12 -0500] rev 19518
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.
Matt Mackall <mpm@selenic.com> [Thu, 01 Aug 2013 17:45:13 -0500] rev 19517
rebase: continue abort without strip for immutable csets (issue3997)
This causes us to simply discard the rebase state.
Matt Mackall <mpm@selenic.com> [Thu, 01 Aug 2013 17:33:09 -0500] rev 19516
rebase: don't clobber wd on --abort when we've updated away (issue4009)