mercurial at 23479: 12 new changesets (2 on stable)

[Mercurial Commits]

12 new changesets (2 on stable) in mercurial:

http://selenic.com/repo/hg//rev/ee311681e591
changeset:   23468:ee311681e591
user:        Mike Edgar <adgar at google.com>
date:        Thu Dec 04 12:02:02 2014 -0500
summary:     parsers: ensure revlog index node tree is initialized before insertion

http://selenic.com/repo/hg//rev/65e48b8d20f5
changeset:   23469:65e48b8d20f5
user:        Ryan McElroy <rmcelroy at fb.com>
date:        Tue Dec 02 20:31:19 2014 -0800
summary:     bookmarks: factor out repository lookup from writing bookmarks file

http://selenic.com/repo/hg//rev/2b23a25f06fd
changeset:   23470:2b23a25f06fd
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Fri Nov 21 11:44:57 2014 -0800
summary:     largefiles: don't clobber merge action message with user message

http://selenic.com/repo/hg//rev/57b9c51cb4b4
changeset:   23471:57b9c51cb4b4
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Fri Nov 21 13:02:45 2014 -0800
summary:     largefiles: use clearer debug messages in actions

http://selenic.com/repo/hg//rev/48cdf90f17c5
changeset:   23472:48cdf90f17c5
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Tue Dec 02 16:39:59 2014 -0800
summary:     update: remove redundant and misplaced merge tests

http://selenic.com/repo/hg//rev/922b10c870c5
changeset:   23473:922b10c870c5
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Sun Nov 23 14:09:10 2014 -0800
summary:     merge: branch code into {n1 and n2, n1, n2} top-level cases

http://selenic.com/repo/hg//rev/9f4ac44a7273
changeset:   23474:9f4ac44a7273
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Sun Nov 23 15:08:50 2014 -0800
summary:     merge: duplicate 'if f in copied' into each branch

http://selenic.com/repo/hg//rev/67f1d68861fb
changeset:   23475:67f1d68861fb
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Wed Dec 03 10:56:07 2014 -0800
summary:     merge: don't ignore conflicting file in remote renamed directory

http://selenic.com/repo/hg//rev/39a12719ec65
changeset:   23476:39a12719ec65
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Wed Dec 03 11:02:52 2014 -0800
summary:     merge: don't overwrite conflicting file in locally renamed directory

http://selenic.com/repo/hg//rev/689540e6007e
changeset:   23477:689540e6007e
branch:      stable
parent:      23440:57d35d3c1cf1
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Tue Dec 02 17:11:01 2014 -0800
summary:     update: add tests for untracked local file

http://selenic.com/repo/hg//rev/30b602168c3b
changeset:   23478:30b602168c3b
branch:      stable
user:        Martin von Zweigbergk <martinvonz at google.com>
date:        Sun Nov 16 23:41:44 2014 -0800
summary:     update: don't overwrite untracked ignored files on update

http://selenic.com/repo/hg//rev/406dfc63a1ad
changeset:   23479:406dfc63a1ad
bookmark:    @
tag:         tip
parent:      23476:39a12719ec65
parent:      23478:30b602168c3b
user:        Matt Mackall <mpm at selenic.com>
date:        Fri Dec 05 12:10:56 2014 -0600
summary:     merge with stable

-- 
Repository URL: http://selenic.com/repo/hg/