| Thu, 04 Feb 2021 13:32:11 -0800 |
Martin von Zweigbergk |
log: respect diff.merge in -p output
|
file |
diff |
annotate
|
| Thu, 04 Feb 2021 13:05:51 -0800 |
Martin von Zweigbergk |
diff: replace --merge option by config option
|
file |
diff |
annotate
|
| Mon, 01 Feb 2021 17:13:24 -0500 |
Augie Fackler |
relnotes: add entry for `hg diff --merge -c`
|
file |
diff |
annotate
|
| Mon, 01 Feb 2021 12:55:53 -0800 |
Martin von Zweigbergk |
branching: merge with stable
|
file |
diff |
annotate
|
| Fri, 29 Jan 2021 10:32:19 -0800 |
Martin von Zweigbergk |
relnotes: copy "next" to "5.7" and clear "next"
stable 5.7
|
file |
diff |
annotate
|
| Mon, 01 Feb 2021 15:37:03 -0500 |
Matt Harbison |
relnotes: elaborate on the side effects of hooks having HGPLAIN=1
stable
|
file |
diff |
annotate
|
| Fri, 15 Jan 2021 01:58:59 +0100 |
Joerg Sonnenberger |
branchmap: update rev-branch-cache incrementally
|
file |
diff |
annotate
|
| Fri, 15 Jan 2021 01:30:08 +0100 |
Joerg Sonnenberger |
changelog: move branchinfo to changelogrevision
|
file |
diff |
annotate
|
| Mon, 18 Jan 2021 10:24:20 +0100 |
Valentin Gatien-Baron |
purge: move extension into core mercurial
|
file |
diff |
annotate
|
| Fri, 18 Dec 2020 14:45:28 +0100 |
Joerg Sonnenberger |
branchmap: avoid ancestor computations in absence of non-continous branches
|
file |
diff |
annotate
|
| Fri, 08 Jan 2021 18:07:33 +0530 |
Pulkit Goyal |
debuglock: rename flag names to better clarity
|
file |
diff |
annotate
|
| Thu, 17 Dec 2020 09:35:07 -0800 |
Martin von Zweigbergk |
relnotes: document that `hg extdiff` also got -r replaced by --from/--to
|
file |
diff |
annotate
|
| Thu, 17 Dec 2020 13:33:27 -0500 |
Matt Harbison |
relnotes: document automatically setting `HGPLAIN=1` for external hooks
|
file |
diff |
annotate
|
| Mon, 14 Dec 2020 18:09:37 -0800 |
Martin von Zweigbergk |
filemerge: add support for the new "mergediff" marker style to premerge
|
file |
diff |
annotate
|
| Tue, 08 Dec 2020 16:45:13 -0800 |
Martin von Zweigbergk |
mergetools: add new conflict marker format with diffs in
|
file |
diff |
annotate
|
| Thu, 10 Dec 2020 14:39:22 -0800 |
Martin von Zweigbergk |
diff: deprecate -r option
|
file |
diff |
annotate
|
| Sat, 05 Dec 2020 23:35:55 +0100 |
Joerg Sonnenberger |
singlehead: introduce option to restrict to public changes
|
file |
diff |
annotate
|
| Wed, 09 Dec 2020 18:31:19 -0800 |
Martin von Zweigbergk |
diff: add --from and --to flags as clearer alternative to -r -r
|
file |
diff |
annotate
|
| Tue, 01 Dec 2020 22:19:01 +0100 |
Joerg Sonnenberger |
relnotes: document better memory use for unbundle
|
file |
diff |
annotate
|
| Fri, 30 Oct 2020 12:46:38 -0700 |
Martin von Zweigbergk |
relnotes: document new [command-templates] section
|
file |
diff |
annotate
|
| Sun, 08 Nov 2020 16:23:35 -0500 |
Valentin Gatien-Baron |
strip: move into core
|
file |
diff |
annotate
|
| Sun, 08 Nov 2020 20:12:32 +0100 |
Joerg Sonnenberger |
relnotes: drop 5.6 release entries from next
|
file |
diff |
annotate
|
| Mon, 02 Nov 2020 14:39:43 -0500 |
Augie Fackler |
merge with stable
|
file |
diff |
annotate
|
| Thu, 29 Oct 2020 13:29:05 +0100 |
Joerg Sonnenberger |
relnotes: mention improved memory use and underlaying API changes
|
file |
diff |
annotate
|
| Thu, 29 Oct 2020 11:37:22 -0700 |
Martin von Zweigbergk |
relnotes: copy "next" to "5.6" and clear "next"
stable
|
file |
diff |
annotate
|
| Sat, 17 Oct 2020 13:06:18 +0900 |
Yuya Nishihara |
relnotes: add diffcontains() to new features list
stable
|
file |
diff |
annotate
|
| Mon, 21 Sep 2020 11:12:58 -0700 |
Martin von Zweigbergk |
merge: make low-level update() private (API)
|
file |
diff |
annotate
|
| Tue, 28 Jul 2020 09:58:28 -0700 |
Martin von Zweigbergk |
rename: add support for --at-rev, which marks as copy and removes the source
|
file |
diff |
annotate
|
| Tue, 28 Jul 2020 10:19:49 -0700 |
Martin von Zweigbergk |
relnotes: copy "next" to "5.5" and clear "next"
stable
|
file |
diff |
annotate
|
| Tue, 21 Jul 2020 01:04:19 +0200 |
Manuel Jacob |
relnotes: add release notes for relevant changes I did since the 5.4 release
stable
|
file |
diff |
annotate
|
| Mon, 20 Jul 2020 18:04:19 +0200 |
Manuel Jacob |
relnotes: fix indentation
stable
|
file |
diff |
annotate
|
| Mon, 20 Jul 2020 17:57:31 +0200 |
Manuel Jacob |
relnotes: make spacing before new section consistent
stable
|
file |
diff |
annotate
|
| Sat, 18 Jul 2020 22:57:28 +0200 |
Joerg Sonnenberger |
relnotes: extend
|
file |
diff |
annotate
|
| Mon, 22 Jun 2020 00:00:07 +0200 |
Joerg Sonnenberger |
clonebundles: optional memory-requirement attribution
|
file |
diff |
annotate
|
| Fri, 05 Jun 2020 01:54:13 +0200 |
Manuel Jacob |
perf: make `hg perfwrite` more flexible
|
file |
diff |
annotate
|
| Sat, 30 May 2020 12:36:00 -0400 |
Valentin Gatien-Baron |
relnotes: advertize the possibility to use rust
|
file |
diff |
annotate
|
| Sat, 30 May 2020 23:42:19 +0200 |
Manuel Jacob |
setup: require that Python has TLS 1.1 or TLS 1.2
|
file |
diff |
annotate
|
| Sat, 30 May 2020 23:18:57 +0200 |
Manuel Jacob |
relnotes: note that we now require modern SSL/TLS features in Python
|
file |
diff |
annotate
|
| Mon, 18 May 2020 14:59:59 -0400 |
Augie Fackler |
mergestate: split out merge state handling code from main merge module
|
file |
diff |
annotate
|
| Mon, 18 May 2020 13:18:05 -0400 |
Augie Fackler |
relnotes: add API change note per request in D8502
|
file |
diff |
annotate
|
| Mon, 18 May 2020 08:31:32 -0700 |
Martin von Zweigbergk |
relnotes: copy "next" to "5.4" and clear "next"
stable
|
file |
diff |
annotate
|
| Fri, 13 Mar 2020 16:57:38 -0700 |
Martin von Zweigbergk |
rebase: accept multiple --base arguments (BC)
|
file |
diff |
annotate
|
| Fri, 13 Mar 2020 16:39:32 -0700 |
Martin von Zweigbergk |
rebase: accept multiple --source arguments (BC)
|
file |
diff |
annotate
|
| Sat, 29 Feb 2020 12:58:38 +0530 |
Pulkit Goyal |
pull: add `--confirm` flag to confirm before writing changes
|
file |
diff |
annotate
|
| Fri, 28 Feb 2020 11:32:02 -0800 |
Martin von Zweigbergk |
commit: clear resolved mergestate even if working copy is clean
|
file |
diff |
annotate
|
| Fri, 24 Jan 2020 15:28:37 -0800 |
Martin von Zweigbergk |
merge: make hg.merge() take a context instead of a node
|
file |
diff |
annotate
|
| Tue, 25 Feb 2020 20:27:39 -0500 |
Valentin Gatien-Baron |
exchange: turn on option that makes concurrent pushes work better
|
file |
diff |
annotate
|
| Wed, 26 Feb 2020 11:00:50 -0800 |
Martin von Zweigbergk |
merge: drop redundant mergeforce argument from hg.merge()
|
file |
diff |
annotate
|
| Thu, 13 Feb 2020 21:14:20 -0800 |
Martin von Zweigbergk |
debugmergestate: make templated
|
file |
diff |
annotate
|
| Wed, 26 Feb 2020 10:56:27 -0500 |
Valentin Gatien-Baron |
relnotes: move entry to the right spot
|
file |
diff |
annotate
|
| Wed, 26 Feb 2020 17:16:25 +0100 |
Pierre-Yves David |
revlog-compression: release note entry for update the config to be a list
|
file |
diff |
annotate
|
| Thu, 13 Feb 2020 22:51:17 -0500 |
Valentin Gatien-Baron |
bookmarks: prevent pushes of divergent bookmarks (foo@remote)
|
file |
diff |
annotate
|
| Sat, 15 Feb 2020 14:51:33 -0500 |
Valentin Gatien-Baron |
bookmarks: avoid traceback when two pushes race to delete the same bookmark
|
file |
diff |
annotate
|
| Sat, 15 Feb 2020 15:06:41 -0500 |
Valentin Gatien-Baron |
relnotes: add entry about previous `hg recover` change
|
file |
diff |
annotate
|
| Fri, 20 Dec 2019 13:24:46 -0800 |
Martin von Zweigbergk |
copy: add experimental support for marking committed copies
|
file |
diff |
annotate
|
| Tue, 28 Jan 2020 14:07:57 -0800 |
Martin von Zweigbergk |
copy: add experimetal support for unmarking committed copies
|
file |
diff |
annotate
|
| Fri, 20 Dec 2019 15:50:13 -0800 |
Martin von Zweigbergk |
copy: add option to unmark file as copied
|
file |
diff |
annotate
|
| Fri, 10 Jan 2020 14:22:20 -0800 |
Martin von Zweigbergk |
rebase: don't use rebased node as dirstate p2 (BC)
|
file |
diff |
annotate
|
| Tue, 28 Jan 2020 21:49:50 -0800 |
Martin von Zweigbergk |
graphlog: use '%' for other context in merge conflict
|
file |
diff |
annotate
|
| Wed, 29 Jan 2020 11:30:35 -0800 |
Martin von Zweigbergk |
revset: add a revset for parents in merge state
|
file |
diff |
annotate
|