mercurial at 20595: 12 new changesets (7 stable)

Mercurial Commits hg at intevation.org
Thu Feb 27 19:00:13 CST 2014


12 new changesets (7 stable) in mercurial:

http://selenic.com/repo/hg//rev/224a058f7cd1
changeset:   20584:224a058f7cd1
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Feb 25 10:21:54 2014 -0800
summary:     obsstore: `create` method return True if a marker is actually added

http://selenic.com/repo/hg//rev/f3c8db3d6d66
changeset:   20585:f3c8db3d6d66
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Feb 25 10:32:54 2014 -0800
summary:     obsstore: add a __len__ method

http://selenic.com/repo/hg//rev/2d52f37937b0
changeset:   20586:2d52f37937b0
user:        Lucas Moscovicz <lmoscovicz at fb.com>
date:        Thu Feb 13 09:00:25 2014 -0800
summary:     revset: changed lazyset __add__ implementation to work lazily

http://selenic.com/repo/hg//rev/cb18fe3461b1
changeset:   20587:cb18fe3461b1
user:        Lucas Moscovicz <lmoscovicz at fb.com>
date:        Thu Feb 13 09:18:16 2014 -0800
summary:     revset: changed spanset __add__ implementation to work lazily

http://selenic.com/repo/hg//rev/4c4cd64c754b
changeset:   20588:4c4cd64c754b
branch:      stable
parent:      20577:de48422df393
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Feb 25 17:14:49 2014 -0800
summary:     merge: move merge state file path into a constant

http://selenic.com/repo/hg//rev/31993cd23b11
changeset:   20589:31993cd23b11
branch:      stable
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Thu Feb 27 12:59:41 2014 -0800
summary:     merge: change the merge state serialisation to use a record based logic

http://selenic.com/repo/hg//rev/2b7d54e929b4
changeset:   20590:2b7d54e929b4
branch:      stable
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Feb 25 18:37:06 2014 -0800
summary:     merge: introduce new format for the state file

http://selenic.com/repo/hg//rev/02c60e380fd0
changeset:   20591:02c60e380fd0
branch:      stable
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Feb 25 18:42:11 2014 -0800
summary:     merge: record the "other" node in merge state

http://selenic.com/repo/hg//rev/303cbfe3dcc8
changeset:   20592:303cbfe3dcc8
branch:      stable
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Thu Feb 27 14:14:57 2014 -0800
summary:     merge: infer the "other" changeset when falling back to v1 format

http://selenic.com/repo/hg//rev/3678707e4017
changeset:   20593:3678707e4017
branch:      stable
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Feb 25 18:54:47 2014 -0800
summary:     merge: add "other" file node in the merge state file

http://selenic.com/repo/hg//rev/ba619c50a355
changeset:   20594:ba619c50a355
branch:      stable
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Feb 25 18:45:01 2014 -0800
summary:     resolve: use "other" changeset from merge state (issue4163)

http://selenic.com/repo/hg//rev/710c2755e66a
changeset:   20595:710c2755e66a
tag:         tip
parent:      20587:cb18fe3461b1
parent:      20594:ba619c50a355
user:        Matt Mackall <mpm at selenic.com>
date:        Thu Feb 27 18:57:03 2014 -0600
summary:     merge with stable

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


More information about the Mercurial-devel mailing list