mercurial at 45283: 10 new changesets

[Mercurial Commits]

10 new changesets in mercurial:

https://www.mercurial-scm.org/repo/hg/rev/0e18861f96ab
changeset:   45274:0e18861f96ab
parent:      45270:c8655782ef19
user:        Pulkit Goyal <7895pulkit at gmail.com>
date:        Thu Jul 23 18:03:14 2020 +0530
summary:     merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API)

https://www.mercurial-scm.org/repo/hg/rev/8e8d513941b4
changeset:   45275:8e8d513941b4
user:        Pulkit Goyal <7895pulkit at gmail.com>
date:        Tue Jul 14 16:21:08 2020 +0530
summary:     merge: introduce 'commitinfo' in mergeresult

https://www.mercurial-scm.org/repo/hg/rev/cb6a72dc0511
changeset:   45276:cb6a72dc0511
user:        Pulkit Goyal <7895pulkit at gmail.com>
date:        Tue Jul 14 16:31:52 2020 +0530
summary:     merge: pass commitinfo to applyupdates() and get it stored in mergestate

https://www.mercurial-scm.org/repo/hg/rev/c515c54f6530
changeset:   45277:c515c54f6530
user:        Pulkit Goyal <7895pulkit at gmail.com>
date:        Tue Jul 14 16:40:28 2020 +0530
summary:     merge: remove no longer required ACTION_GET_OTHER_AND_STORE

https://www.mercurial-scm.org/repo/hg/rev/0c849f0166c2
changeset:   45278:0c849f0166c2
user:        Pulkit Goyal <7895pulkit at gmail.com>
date:        Sun Aug 02 10:12:21 2020 -0700
summary:     merge: introduce hasconflicts() on mergeresult object

https://www.mercurial-scm.org/repo/hg/rev/f4a2b329717b
changeset:   45279:f4a2b329717b
user:        Pulkit Goyal <7895pulkit at gmail.com>
date:        Fri Jul 24 14:45:00 2020 +0530
summary:     merge: move conversion of file-key dict to action-key dict in mergeresult

https://www.mercurial-scm.org/repo/hg/rev/98218c83242f
changeset:   45280:98218c83242f
user:        Pulkit Goyal <7895pulkit at gmail.com>
date:        Fri Jul 24 15:15:20 2020 +0530
summary:     merge: improve documentation of fbid dict used for merge bid

https://www.mercurial-scm.org/repo/hg/rev/fe2040abb183
changeset:   45281:fe2040abb183
user:        Pulkit Goyal <7895pulkit at gmail.com>
date:        Fri Jul 24 15:56:11 2020 +0530
summary:     merge: make mergeresult constructor initialize empty object

https://www.mercurial-scm.org/repo/hg/rev/b442920ab1de
changeset:   45282:b442920ab1de
user:        Pulkit Goyal <7895pulkit at gmail.com>
date:        Fri Jul 24 16:18:39 2020 +0530
summary:     merge: introduce mergeresult.addfile() and use it

https://www.mercurial-scm.org/repo/hg/rev/f1fb9a079131
changeset:   45283:f1fb9a079131
bookmark:    @
tag:         tip
user:        Pulkit Goyal <7895pulkit at gmail.com>
date:        Fri Jul 24 16:23:55 2020 +0530
summary:     merge: add removefile() to mergeresult object

-- 
Repository URL: https://www.mercurial-scm.org/repo/hg