| Fri, 03 Dec 2021 21:41:43 -0800 |
Martin von Zweigbergk |
filemerge: make `_filemerge()` do both premerge and merge
|
| Fri, 03 Dec 2021 16:21:46 -0800 |
Martin von Zweigbergk |
filemerge: merge `premerge()` into `filemerge()`
|
| Fri, 03 Dec 2021 15:43:54 -0800 |
Martin von Zweigbergk |
mergestate: inline `_resolve()` into `resolve()`
|
| Fri, 03 Dec 2021 13:53:02 -0800 |
Martin von Zweigbergk |
mergestate: make `_resolve()` do both preresolve and resolve
|
| Thu, 02 Dec 2021 22:59:36 -0800 |
Martin von Zweigbergk |
mergestate: merge `preresolve()` into `resolve()`
|
| Fri, 03 Dec 2021 21:50:25 -0800 |
Martin von Zweigbergk |
tests: remove unnecessary explicit args from `failfilemerge.py`
|
| Mon, 29 Nov 2021 23:00:29 -0800 |
Martin von Zweigbergk |
simplemerge: set `conflicts` earlier for :union tool
|
| Fri, 26 Nov 2021 11:53:54 +0100 |
Raphaël Gomès |
typo: s/unkown/unknown across the codebase
|
| Thu, 25 Nov 2021 18:33:51 +0100 |
Simon Sapin |
rhg: Update the dirstate on disk after status
|
| Thu, 02 Dec 2021 15:10:03 +0100 |
Simon Sapin |
rhg: Add Repo::write_dirstate
|
| Thu, 02 Dec 2021 12:05:36 +0100 |
Simon Sapin |
rhg: Add lazy/cached dirstate data file ID parsing on Repo
|
| Mon, 29 Nov 2021 19:00:11 +0100 |
Simon Sapin |
rhg: Make Repo::dirstate_parents a LazyCell
|
| Mon, 29 Nov 2021 18:46:04 +0100 |
Simon Sapin |
rust: Add Vfs::write_atomic
|
| Mon, 22 Mar 2021 09:07:10 +0100 |
Simon Sapin |
rhg: Initial repository locking
|
| Mon, 29 Nov 2021 17:37:08 +0100 |
Simon Sapin |
rust: Serializing a DirstateMap does not mutate it anymore
|
| Fri, 26 Nov 2021 15:07:59 +0100 |
Raphaël Gomès |
rhg: don't run `blackbox` if not activated
|
| Fri, 26 Nov 2021 15:05:58 +0100 |
Raphaël Gomès |
rust: add function to check if an extension is enabled
|
| Fri, 03 Dec 2021 15:06:40 +0100 |
Raphaël Gomès |
dirstate: remove unused method
|
| Sat, 04 Dec 2021 03:51:33 +0100 |
Pierre-Yves David |
python2-compat: fix extensions' tests on python2
|
| Tue, 16 Nov 2021 11:53:58 +0000 |
Arseniy Alekseyev |
rhg: add support for narrow clones and sparse checkouts
|
| Fri, 03 Dec 2021 14:36:40 +0100 |
Pierre-Yves David |
update: reformat the `commands.update.check` help
|
| Fri, 03 Dec 2021 12:03:23 +0100 |
Pierre-Yves David |
update: properly overwrite `check` config with `--no-` variants
|
| Fri, 03 Dec 2021 12:19:36 +0100 |
Pierre-Yves David |
update: add a test for `--merge` overriding the "abort" config
|
| Fri, 03 Dec 2021 12:01:00 +0100 |
Pierre-Yves David |
update: use long version of the flag in the test
|
| Mon, 22 Nov 2021 10:47:12 +0100 |
Raphaël Gomès |
backout: backed out changeset 5d83a40cd3f8
|
| Wed, 24 Nov 2021 05:00:28 +0100 |
Pierre-Yves David |
status: keep second-ambiguous mtimes during fixup
|
| Wed, 24 Nov 2021 04:43:57 +0100 |
Pierre-Yves David |
dirstate-item: make sure we load `mtime-second-ambiguous` from disk
|
| Wed, 24 Nov 2021 05:00:06 +0100 |
Pierre-Yves David |
dirstate-item: make sure we set the mtime-second-ambiguous on v2 write
|
| Wed, 24 Nov 2021 04:59:48 +0100 |
Pierre-Yves David |
dirstate-item: ignore mtime to write v1 when `mtime-second-ambiguous` is set
|
| Wed, 24 Nov 2021 04:51:05 +0100 |
Pierre-Yves David |
dirstate-item: implement the comparison logic for mtime-second-ambiguous
|
| Wed, 24 Nov 2021 04:40:00 +0100 |
Pierre-Yves David |
dirstate-item: add a "second_ambiguous` flag in the mtime tuple
|
| Tue, 23 Nov 2021 19:27:17 +0100 |
Pierre-Yves David |
dirstate: drop comparison primitive on the timestamp class
|
