| Thu, 03 Sep 2020 13:58:14 +0530 |
Pulkit Goyal |
commit: force create a new filenode if it was set in mergestate by merge
|
| Thu, 03 Sep 2020 13:44:06 +0530 |
Pulkit Goyal |
merge: store commitinfo if these is a dc or cd conflict
|
| Fri, 25 Sep 2020 13:58:05 +0530 |
Pulkit Goyal |
mergestate: update _stateextras instead of reassinging
|
| Mon, 14 Sep 2020 14:11:45 +0530 |
Pulkit Goyal |
tests: add some debugmergestate calls in `test-merge-criss-cross.t`
|
| Thu, 03 Sep 2020 13:54:46 +0530 |
Pulkit Goyal |
tests: add few debugrevlogindex and a log call to see changes in next test
|
| Mon, 14 Sep 2020 14:40:12 +0530 |
Pulkit Goyal |
merge: disable `m2-vs-ma` optimization if new filenode config is true
|
| Mon, 14 Sep 2020 14:31:23 +0530 |
Pulkit Goyal |
configitems: add a new config option to control new filenode functionality
|
| Wed, 23 Sep 2020 14:20:49 -0400 |
Connor Sheehan |
git: add test showing `hg commit -i` working on a git repo
|
| Mon, 21 Sep 2020 11:53:44 -0700 |
Martin von Zweigbergk |
merge: replace calls to hg.updaterepo() by merge.update()
|
| Mon, 21 Sep 2020 09:57:29 -0700 |
Martin von Zweigbergk |
merge: add a higher-level update() for the common `hg update` use case
|
| Wed, 23 Sep 2020 15:16:35 +0200 |
Pierre-Yves David |
sidedata: simply read p2copies files from the `ChangingFiles` object
|
| Wed, 23 Sep 2020 15:16:16 +0200 |
Pierre-Yves David |
sidedata: simply read p1copies files from the `ChangingFiles` object
|
| Wed, 23 Sep 2020 15:16:01 +0200 |
Pierre-Yves David |
sidedata: simply read removed files from the `ChangingFiles` object
|
| Wed, 23 Sep 2020 15:15:46 +0200 |
Pierre-Yves David |
sidedata: simply read added files from the `ChangingFiles` object
|
| Wed, 23 Sep 2020 15:13:44 +0200 |
Pierre-Yves David |
sidedata: add a `decode_files_sidedata` function
|
