| Tue, 28 Jan 2020 21:49:50 -0800 |
Martin von Zweigbergk |
graphlog: use '%' for other context in merge conflict
|
| Wed, 29 Jan 2020 14:42:54 -0800 |
Martin von Zweigbergk |
tests: add `hg log -G` output when there are merge conflicts
|
| Wed, 29 Jan 2020 11:30:35 -0800 |
Martin von Zweigbergk |
revset: add a revset for parents in merge state
|
| Fri, 10 Jan 2020 17:46:10 -0800 |
Martin von Zweigbergk |
tests: add test of rebase with conflict in merge commit
|
| Thu, 16 Jan 2020 00:03:19 -0800 |
Martin von Zweigbergk |
rebase: always be graft-like, not merge-like, also for merges
|
| Wed, 15 Jan 2020 15:51:01 +0100 |
Pierre-Yves David |
nodemap: update the index with the newly written data (when appropriate)
|
| Wed, 15 Jan 2020 15:50:52 +0100 |
Pierre-Yves David |
nodemap: never read more than the expected data amount
|
| Wed, 15 Jan 2020 15:50:43 +0100 |
Pierre-Yves David |
nodemap: write new data from the expected current data length
|
| Wed, 15 Jan 2020 15:50:33 +0100 |
Pierre-Yves David |
nodemap: double check the source docket when doing incremental update
|
| Wed, 15 Jan 2020 15:50:24 +0100 |
Pierre-Yves David |
nodemap: track the total and unused amount of data in the rawdata file
|
| Wed, 15 Jan 2020 15:50:14 +0100 |
Pierre-Yves David |
nodemap: track the maximum revision tracked in the nodemap
|
| Wed, 15 Jan 2020 15:50:04 +0100 |
Pierre-Yves David |
nodemap: add a flag to dump the details of the docket
|
| Wed, 15 Jan 2020 15:49:54 +0100 |
Pierre-Yves David |
nodemap: introduce append-only incremental update of the persistent data
|
| Thu, 20 Feb 2020 16:21:00 -0800 |
Kyle Lippincott |
shelve: fix ordering of merge labels
stable
|
| Thu, 20 Feb 2020 17:06:01 -0800 |
Kyle Lippincott |
shelve: add test clearly demonstrating that the conflict labels are backwards
stable
|
