mercurial at 26635: 23 new changesets

[Mercurial Commits]

23 new changesets in mercurial:

http://selenic.com/repo/hg//rev/abb5ec3eb6ce
changeset:   26613:abb5ec3eb6ce
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Oct 11 15:04:00 2015 -0700
summary:     filemerge: clean up some dead code

http://selenic.com/repo/hg//rev/ef1eb6df7071
changeset:   26614:ef1eb6df7071
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Fri Oct 09 13:54:52 2015 -0700
summary:     simplemerge: move conflict warning message to filemerge

http://selenic.com/repo/hg//rev/c9223a3979b7
changeset:   26615:c9223a3979b7
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Oct 11 18:29:50 2015 -0700
summary:     merge.mergestate: add a wrapper around resolve

http://selenic.com/repo/hg//rev/2f1fce0d4e86
changeset:   26616:2f1fce0d4e86
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Oct 11 18:37:54 2015 -0700
summary:     merge.mergestate._resolve: also return completed status

http://selenic.com/repo/hg//rev/dfd9811c5c9b
changeset:   26617:dfd9811c5c9b
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Oct 11 20:12:12 2015 -0700
summary:     merge: introduce a preresolve function

http://selenic.com/repo/hg//rev/8e6d5b7317e6
changeset:   26618:8e6d5b7317e6
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Oct 11 21:56:39 2015 -0700
summary:     merge.mergestate: perform all premerges before any merges (BC)

http://selenic.com/repo/hg//rev/3b213a904b98
changeset:   26619:3b213a904b98
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Oct 11 23:54:40 2015 -0700
summary:     test-resolve.t: add some output to show order of operations

http://selenic.com/repo/hg//rev/7955127efbcb
changeset:   26620:7955127efbcb
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Oct 11 23:56:44 2015 -0700
summary:     test-resolve.t: add some tests for .orig file contents

http://selenic.com/repo/hg//rev/36383507a6f8
changeset:   26621:36383507a6f8
user:        Siddharth Agarwal <sid0 at fb.com>
date:        Sun Oct 11 23:58:07 2015 -0700
summary:     resolve: perform all premerges before performing any file merges (BC)

http://selenic.com/repo/hg//rev/9e15286609ae
changeset:   26622:9e15286609ae
user:        Gregory Szorc <gregory.szorc at gmail.com>
date:        Tue Sep 29 16:17:32 2015 -0700
summary:     sslutil: expose attribute indicating whether SNI is supported

http://selenic.com/repo/hg//rev/5a95fe44121d
changeset:   26623:5a95fe44121d
user:        Gregory Szorc <gregory.szorc at gmail.com>
date:        Fri Oct 09 11:22:01 2015 -0700
summary:     clonebundles: support for seeding clones from pre-generated bundles

http://selenic.com/repo/hg//rev/bcace0fbb4c8
changeset:   26624:bcace0fbb4c8
user:        Ryan McElroy <rmcelroy at fb.com>
date:        Fri Oct 09 14:48:59 2015 -0700
summary:     strip: factor out revset calculation for strip -B

http://selenic.com/repo/hg//rev/adae8928fe09
changeset:   26625:adae8928fe09
user:        Mads Kiilerich <madski at unity3d.com>
date:        Mon Oct 12 20:13:12 2015 +0200
summary:     windows: read all global config files, not just the first (issue4491) (BC)

http://selenic.com/repo/hg//rev/dca161728dc9
changeset:   26626:dca161728dc9
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Sun Oct 11 22:13:03 2015 -0700
summary:     patchbomb: check that targets exist at the publicurl

http://selenic.com/repo/hg//rev/832c98d79587
changeset:   26627:832c98d79587
user:        Mads Kiilerich <madski at unity3d.com>
date:        Mon Oct 12 19:22:34 2015 +0200
summary:     largefiles: better handling of merge of largefiles that not are available

http://selenic.com/repo/hg//rev/45b86dbabbda
changeset:   26628:45b86dbabbda
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Mon Oct 05 03:50:47 2015 -0700
summary:     destupdate: move the check related to the "clean" logic in the function

http://selenic.com/repo/hg//rev/ae5f7be2b4ab
changeset:   26629:ae5f7be2b4ab
user:        Pierre-Yves David <pierre-yves.david at fb.com>
date:        Tue Sep 29 00:18:49 2015 -0700
summary:     destupdate: include the 'check' logic

http://selenic.com/repo/hg//rev/3111b45a2bbf
changeset:   26630:3111b45a2bbf
user:        FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
date:        Wed Oct 14 02:40:04 2015 +0900
summary:     parsers: make pack_dirstate take now in integer for consistency

http://selenic.com/repo/hg//rev/e077ce385609
changeset:   26631:e077ce385609
user:        FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
date:        Tue Oct 13 12:25:43 2015 -0700
summary:     localrepo: restore dirstate to one before rollbacking if not parent-gone

http://selenic.com/repo/hg//rev/59b5e8844eb0
changeset:   26632:59b5e8844eb0
user:        FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
date:        Wed Oct 14 02:49:17 2015 +0900
summary:     dirstate: move code paths for backup from dirstateguard to dirstate

http://selenic.com/repo/hg//rev/020b12d591f3
changeset:   26633:020b12d591f3
user:        FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
date:        Wed Oct 14 02:49:17 2015 +0900
summary:     dirstate: make functions for backup aware of transaction activity

http://selenic.com/repo/hg//rev/09bb1ee7e73e
changeset:   26634:09bb1ee7e73e
user:        FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
date:        Wed Oct 14 02:49:17 2015 +0900
summary:     dirstate: make writing in-memory changes aware of transaction activity

http://selenic.com/repo/hg//rev/79d86ab65c9d
changeset:   26635:79d86ab65c9d
bookmark:    @
tag:         tip
user:        FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
date:        Wed Oct 14 02:49:17 2015 +0900
summary:     dirstate: read from pending file under HG_PENDING mode if it exists

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