| Tue, 07 Sep 2021 11:50:12 -0700 |
Kyle Lippincott |
filemerge: be more strict when detecting conflict markers, add `|` markers
stable
|
changeset |
files
|
| Fri, 27 Aug 2021 18:00:47 +0200 |
Pierre-Yves David |
dirstate-item: implement `v1_mtime` with higher level block
|
changeset |
files
|
| Fri, 27 Aug 2021 17:59:00 +0200 |
Pierre-Yves David |
dirstate-item: implement `v1_size` with higher level block
|
changeset |
files
|
| Fri, 27 Aug 2021 17:48:12 +0200 |
Pierre-Yves David |
dirstate-item: implement v1_state with higher level block
|
changeset |
files
|
| Fri, 27 Aug 2021 18:04:49 +0200 |
Pierre-Yves David |
dirstate-item: add more logic to `from_p2`
|
changeset |
files
|
| Fri, 27 Aug 2021 17:14:54 +0200 |
Pierre-Yves David |
dirstate-item: implement `merged_removed` in a simpler way
|
changeset |
files
|
| Fri, 27 Aug 2021 17:12:39 +0200 |
Pierre-Yves David |
dirstate-item: implement `removed` in a simpler way
|
changeset |
files
|
| Fri, 27 Aug 2021 17:10:26 +0200 |
Pierre-Yves David |
dirstate-item: implement `from_p2_removed` in a simpler way
|
changeset |
files
|
| Fri, 27 Aug 2021 17:09:49 +0200 |
Pierre-Yves David |
dirstate-item: implement `from_p2` in a simpler way
|
changeset |
files
|
| Fri, 27 Aug 2021 17:09:06 +0200 |
Pierre-Yves David |
dirstate-item: implement `merged` in a simpler way
|
changeset |
files
|
| Fri, 27 Aug 2021 17:07:56 +0200 |
Pierre-Yves David |
dirstate-item: implement `added` in a simpler way
|
changeset |
files
|
| Fri, 27 Aug 2021 17:07:12 +0200 |
Pierre-Yves David |
dirstate-item: implement `tracked` in a simpler way
|
changeset |
files
|
| Fri, 27 Aug 2021 15:10:21 +0200 |
Pierre-Yves David |
dirstate-item: keep the full information in memory (for pure form)
|
changeset |
files
|
| Thu, 26 Aug 2021 16:50:14 +0200 |
Pierre-Yves David |
dirstate-item: have all the logic go through the v1_ accessors
|
changeset |
files
|
| Thu, 26 Aug 2021 16:39:00 +0200 |
Pierre-Yves David |
dirstate-item: drop the deprecated __getitem__ variante
|
changeset |
files
|
| Mon, 30 Aug 2021 12:25:57 +0200 |
Raphaël Gomès |
branching: merge stable into default
|
changeset |
files
|
| Fri, 27 Aug 2021 09:09:10 -0400 |
Valentin Gatien-Baron |
tests: normalize the way some debug output it matched
|
changeset |
files
|
| Mon, 02 Aug 2021 23:46:26 -0400 |
Valentin Gatien-Baron |
tests: drop hgrc bits that have become the default
|
changeset |
files
|
| Mon, 02 Aug 2021 23:43:40 -0400 |
Valentin Gatien-Baron |
tests: manual cleanup now that dummyssh usage is implied
|
changeset |
files
|
| Mon, 02 Aug 2021 21:25:01 -0400 |
Valentin Gatien-Baron |
tests: rely on dummyssh being the default
|
changeset |
files
|
| Mon, 02 Aug 2021 21:10:42 -0400 |
Valentin Gatien-Baron |
tests: setup dummyssh as the default ssh
|
changeset |
files
|
| Tue, 24 Aug 2021 21:25:35 +0200 |
Pierre-Yves David |
dirstate: drop the `_otherparent` method
|
changeset |
files
|
| Tue, 24 Aug 2021 21:18:28 +0200 |
Pierre-Yves David |
dirstate: drop the `_normal` method
|
changeset |
files
|
| Tue, 24 Aug 2021 21:16:48 +0200 |
Pierre-Yves David |
dirstate: drop the `_merge` method
|
changeset |
files
|