Sat, 19 Dec 2020 01:42:51 -0500 |
Matt Harbison |
mergetools: add BeyondCompare 4 for Windows
|
Sat, 19 Dec 2020 01:19:02 -0500 |
Matt Harbison |
mergetools: add support for 32-bit BeyondCompare 3 on 64-bit Windows
|
Sat, 19 Dec 2020 01:15:44 -0500 |
Matt Harbison |
mergetools: enable the `checkconflicts` option for Araxis Merge
|
Sat, 19 Dec 2020 01:10:57 -0500 |
Matt Harbison |
mergetools: sync up comments with the TortoiseHg copy of the config file
|
Mon, 14 Dec 2020 16:33:15 +0100 |
Simon Sapin |
rust: introduce Repo and Vfs types for filesystem abstraction
|
Sat, 19 Dec 2020 15:56:54 +0100 |
Pierre-Yves David |
bundle2: drop some outdated comment
|
Fri, 24 Apr 2020 16:36:04 +0200 |
Joerg Sonnenberger |
bundle: optional advisory obsolescence parts
|
Thu, 17 Dec 2020 09:35:07 -0800 |
Martin von Zweigbergk |
relnotes: document that `hg extdiff` also got -r replaced by --from/--to
|
Mon, 14 Dec 2020 17:22:11 +0100 |
Pierre-Yves David |
hghave: add some official category for known-bad and missing-good output
|
Mon, 14 Dec 2020 01:32:22 +0100 |
Pierre-Yves David |
copies: rename value/other variable to minor/major for clarity
|
Mon, 14 Dec 2020 01:30:32 +0100 |
Pierre-Yves David |
copies: extract value comparison in the python copy tracing
|
Sun, 13 Dec 2020 19:18:10 +0100 |
Pierre-Yves David |
copies: explain the "arbitrary" copy source pick in case of conflict
|
Sun, 13 Dec 2020 20:16:34 +0100 |
Pierre-Yves David |
copies: properly match result during changeset centric copy tracing
|
Sun, 13 Dec 2020 20:26:27 +0100 |
Pierre-Yves David |
copies: avoid early return in _combine_changeset_copies
|
Wed, 02 Dec 2020 15:37:54 +0100 |
Pierre-Yves David |
copies-rust: record overwrite when merging
|
Wed, 02 Dec 2020 15:24:10 +0100 |
Pierre-Yves David |
copies-rust: make the comparison aware of the revision being current merged
|
Sat, 21 Nov 2020 17:00:32 +0100 |
Pierre-Yves David |
copies-rust: start recording overwrite as they happens
|
Wed, 02 Dec 2020 16:11:35 +0100 |
Pierre-Yves David |
copies-rust: rename Oracle.is_ancestor to Oracle.is_overwrite
|
Wed, 02 Dec 2020 11:04:11 +0100 |
Pierre-Yves David |
copies-rust: use the `entry` API for copy information too
|
Wed, 02 Dec 2020 10:51:40 +0100 |
Pierre-Yves David |
copies-rust: use the entry API to overwrite deleted entry
|
Sat, 25 Apr 2020 12:37:46 +0200 |
Pierre-Yves David |
copies-rust: tokenize all paths into integer
|
Fri, 20 Nov 2020 13:46:14 +0100 |
Pierre-Yves David |
copies: no longer cache the ChangedFiles during copy tracing
|
Mon, 14 Dec 2020 11:32:24 +0100 |
Pierre-Yves David |
copies: iterate over children directly (instead of parents)
|
Mon, 14 Dec 2020 11:32:20 +0100 |
Pierre-Yves David |
copies: document the current algorithm step
|
Thu, 24 Dec 2020 15:58:08 +0900 |
Yuya Nishihara |
log: update documentation about --follow with/without --rev (issue6459)
stable
|
Sat, 12 Dec 2020 15:27:58 +0530 |
Pulkit Goyal |
contrib: run python3+chg tests too in heptapod CI
|
Fri, 18 Dec 2020 13:53:26 +0530 |
Pulkit Goyal |
chgserver: respect detailed exit code in case of ConfigError
|
Thu, 17 Dec 2020 18:08:25 +0100 |
Joerg Sonnenberger |
cext: shut-up sign compare warnings
|
Thu, 17 Dec 2020 10:43:43 -0800 |
Martin von Zweigbergk |
errors: respect ui.detailed-exit-code in chg
|
Thu, 17 Dec 2020 13:33:27 -0500 |
Matt Harbison |
relnotes: document automatically setting `HGPLAIN=1` for external hooks
|
Sat, 28 Nov 2020 22:27:12 +0100 |
Joerg Sonnenberger |
cext: isolate hash size in the revlog handling in a single place
|
Thu, 17 Dec 2020 12:28:39 +0100 |
Simon Sapin |
rust: document how to enable debug information in optimized builds
|
Mon, 14 Dec 2020 18:09:37 -0800 |
Martin von Zweigbergk |
filemerge: add support for the new "mergediff" marker style to premerge
|
Mon, 14 Dec 2020 14:31:15 +0100 |
Pierre-Yves David |
test-narrow: mitigate the flakyness of test-narrow-shallow
|
Mon, 14 Dec 2020 18:03:29 -0500 |
Matt Harbison |
hook: set `HGPLAIN=1` for external hooks
|
Mon, 14 Dec 2020 17:59:10 -0500 |
Matt Harbison |
setup: exclude the git extension from py2 builds
|
Mon, 14 Dec 2020 14:59:23 +0100 |
Simon Sapin |
rust: replace most "operation" structs with functions
|
Mon, 14 Dec 2020 13:47:44 +0100 |
Simon Sapin |
rust: change &PathBuf parameters to &Path
|
Wed, 16 Dec 2020 21:06:29 -0800 |
Martin von Zweigbergk |
extdiff: add --from/--to and deprecate -r, as was done for `hg diff`
|
Wed, 16 Dec 2020 22:30:07 -0800 |
Martin von Zweigbergk |
extdiff: fix crash when showing diff from wdir()
|
Wed, 16 Dec 2020 22:16:05 -0800 |
Martin von Zweigbergk |
extdiff: pass contexts instead of nodeids into diffrevs()
|
Wed, 16 Dec 2020 21:40:27 -0800 |
Martin von Zweigbergk |
tests: remove undefined (empty) $opt from test-extdiff.t
|
Tue, 21 Apr 2020 15:13:13 +0200 |
Pierre-Yves David |
copies-rust: pre-introduce a PathToken type and use it where applicable
|
Sat, 21 Nov 2020 09:40:52 +0100 |
Pierre-Yves David |
copies-rust: add smarter approach for merging small mapping with large mapping
|
Sat, 21 Nov 2020 10:50:14 +0100 |
Pierre-Yves David |
copies-rust: hide most of the comparison details inside a closure
|
Sat, 21 Nov 2020 09:31:34 +0100 |
Pierre-Yves David |
copies-rust: move the mapping merging into a else clause
|
Sat, 21 Nov 2020 09:30:34 +0100 |
Pierre-Yves David |
copies-rust: extract conflicting value comparison in its own function
|
Thu, 17 Dec 2020 00:48:36 -0500 |
Matt Harbison |
mergetools: alphabetize the config settings
|