Fri, 24 Jul 2020 17:49:13 +0530 |
Pulkit Goyal |
merge: pass mergeresult obj instead of actions in _filternarrowactions()
|
changeset |
files
|
Fri, 24 Jul 2020 17:31:26 +0530 |
Pulkit Goyal |
merge: pass mergeresult in checkpassconflicts() instead of actions (API)
|
changeset |
files
|
Fri, 24 Jul 2020 16:23:55 +0530 |
Pulkit Goyal |
merge: add removefile() to mergeresult object
|
changeset |
files
|
Fri, 24 Jul 2020 16:18:39 +0530 |
Pulkit Goyal |
merge: introduce mergeresult.addfile() and use it
|
changeset |
files
|
Fri, 24 Jul 2020 15:56:11 +0530 |
Pulkit Goyal |
merge: make mergeresult constructor initialize empty object
|
changeset |
files
|
Fri, 24 Jul 2020 15:15:20 +0530 |
Pulkit Goyal |
merge: improve documentation of fbid dict used for merge bid
|
changeset |
files
|
Fri, 24 Jul 2020 14:45:00 +0530 |
Pulkit Goyal |
merge: move conversion of file-key dict to action-key dict in mergeresult
|
changeset |
files
|
Sun, 02 Aug 2020 10:12:21 -0700 |
Pulkit Goyal |
merge: introduce hasconflicts() on mergeresult object
|
changeset |
files
|
Tue, 14 Jul 2020 16:40:28 +0530 |
Pulkit Goyal |
merge: remove no longer required ACTION_GET_OTHER_AND_STORE
|
changeset |
files
|
Tue, 14 Jul 2020 16:31:52 +0530 |
Pulkit Goyal |
merge: pass commitinfo to applyupdates() and get it stored in mergestate
|
changeset |
files
|
Tue, 14 Jul 2020 16:21:08 +0530 |
Pulkit Goyal |
merge: introduce 'commitinfo' in mergeresult
|
changeset |
files
|
Thu, 23 Jul 2020 18:03:14 +0530 |
Pulkit Goyal |
merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API)
|
changeset |
files
|
Thu, 30 Jul 2020 22:49:51 -0700 |
Martin von Zweigbergk |
packaging: delete unnecessary updating of `dirs` list
|
changeset |
files
|
Sun, 02 Aug 2020 10:08:18 -0700 |
Martin von Zweigbergk |
packaging: make "mercurial.defaultrc" a key in package_data
|
changeset |
files
|
Thu, 30 Jul 2020 12:22:41 -0700 |
Martin von Zweigbergk |
templatespec: use new factory functions in hooklib
|
changeset |
files
|