| Fri, 02 Oct 2020 18:40:39 +0530 |
Pulkit Goyal |
merge: check for conflicting actions irrespective of length of bids
|
file |
diff |
annotate
|
| Wed, 30 Sep 2020 18:07:21 +0530 |
Pulkit Goyal |
merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED
|
file |
diff |
annotate
|
| Wed, 30 Sep 2020 15:46:54 +0530 |
Pulkit Goyal |
merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED
|
file |
diff |
annotate
|
| Mon, 24 Aug 2020 15:35:34 +0530 |
Pulkit Goyal |
merge: store cases when a file is absent post merge in commitinfo
|
file |
diff |
annotate
|
| Thu, 03 Sep 2020 13:44:06 +0530 |
Pulkit Goyal |
merge: store commitinfo if these is a dc or cd conflict
|
file |
diff |
annotate
|
| Mon, 14 Sep 2020 14:40:12 +0530 |
Pulkit Goyal |
merge: disable `m2-vs-ma` optimization if new filenode config is true
|
file |
diff |
annotate
|
| Mon, 21 Sep 2020 09:57:29 -0700 |
Martin von Zweigbergk |
merge: add a higher-level update() for the common `hg update` use case
|
file |
diff |
annotate
|
| Mon, 21 Sep 2020 11:12:58 -0700 |
Martin von Zweigbergk |
merge: make low-level update() private (API)
|
file |
diff |
annotate
|
| Mon, 21 Sep 2020 09:56:48 -0700 |
Martin von Zweigbergk |
merge: add a back_out() function to encapsulate update()
|
file |
diff |
annotate
|
| Wed, 16 Sep 2020 18:09:32 +0530 |
Pulkit Goyal |
mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult
|
file |
diff |
annotate
|
| Wed, 09 Sep 2020 16:49:19 +0530 |
Pulkit Goyal |
mergestate: introduce a new ACTION_KEEP_NEW
|
file |
diff |
annotate
|
| Thu, 17 Sep 2020 22:34:36 -0700 |
Martin von Zweigbergk |
mergedriver: delete it
|
file |
diff |
annotate
|
| Tue, 15 Sep 2020 16:10:16 -0700 |
Martin von Zweigbergk |
merge: use in-memory mergestate when using in-memory context
|
file |
diff |
annotate
|
| Thu, 17 Sep 2020 09:23:21 -0700 |
Martin von Zweigbergk |
mergestate: make clean() only be about creating a clean mergestate
|
file |
diff |
annotate
|
| Thu, 03 Sep 2020 13:25:29 +0530 |
Pulkit Goyal |
merge: move initial handling of mergeactions near to later one
|
file |
diff |
annotate
|