| Wed, 26 Feb 2020 10:48:56 -0800 |
Martin von Zweigbergk |
tests: use new, use-case-specific methods from merge module
|
changeset |
files
|
| Wed, 26 Feb 2020 10:40:31 -0800 |
Martin von Zweigbergk |
merge: introduce a merge() for that use-case
|
changeset |
files
|
| Wed, 26 Feb 2020 11:00:50 -0800 |
Martin von Zweigbergk |
merge: drop redundant mergeforce argument from hg.merge()
|
changeset |
files
|
| Wed, 26 Feb 2020 10:54:17 -0800 |
Martin von Zweigbergk |
merge: change default of hg.merge()'s "force" argument from None to False
|
changeset |
files
|
| Thu, 13 Feb 2020 21:14:20 -0800 |
Martin von Zweigbergk |
debugmergestate: make templated
|
changeset |
files
|
| Thu, 13 Feb 2020 21:55:38 -0800 |
Martin von Zweigbergk |
tests: add tests of debugmergestate with unresolved/resolved path conflicts
|
changeset |
files
|
| Thu, 13 Feb 2020 17:15:08 -0800 |
Martin von Zweigbergk |
mergestate: determine if active without looking for state files on disk
|
changeset |
files
|
| Wed, 26 Feb 2020 14:43:02 -0500 |
Matt Harbison |
phabricator: update the protocol documentation
|
changeset |
files
|
| Wed, 26 Feb 2020 10:56:27 -0500 |
Valentin Gatien-Baron |
relnotes: move entry to the right spot
|
changeset |
files
|
| Wed, 26 Feb 2020 17:16:25 +0100 |
Pierre-Yves David |
revlog-compression: release note entry for update the config to be a list
|
changeset |
files
|
| Tue, 18 Feb 2020 19:11:18 +0100 |
Georges Racinet |
rust-nodemap: a method for full invalidation
|
changeset |
files
|
| Tue, 18 Feb 2020 19:11:17 +0100 |
Georges Racinet |
rust-nodemap: accounting for dead blocks
|
changeset |
files
|
| Tue, 18 Feb 2020 19:11:17 +0100 |
Georges Racinet |
rust-nodemap: core implementation for shortest
|
changeset |
files
|
| Tue, 18 Feb 2020 19:11:16 +0100 |
Georges Racinet |
rust-nodemap: special case for prefixes of NULL_NODE
|
changeset |
files
|
| Tue, 18 Feb 2020 19:11:15 +0100 |
Georges Racinet |
rust-nodemap: pure Rust example
|
changeset |
files
|
| Tue, 18 Feb 2020 19:11:15 +0100 |
Georges Racinet |
rust-nodemap: input/output primitives
|
changeset |
files
|
| Thu, 13 Feb 2020 15:33:36 -0800 |
Martin von Zweigbergk |
pyoxidizer: allow extensions to be loaded from the file system
|
changeset |
files
|
| Mon, 17 Feb 2020 20:30:03 -0500 |
Valentin Gatien-Baron |
graft: always allow hg graft --base . (issue6248)
|
changeset |
files
|
| Wed, 19 Feb 2020 17:30:04 +0100 |
Pierre-Yves David |
revlog-compression: update the config to be a list
|
changeset |
files
|
| Wed, 19 Feb 2020 13:39:00 +0530 |
Pulkit Goyal |
remotefilelog: add 'changelog' arg to shallowcg1packer.generate (issue6269)
|
changeset |
files
|
| Tue, 25 Feb 2020 12:41:35 -0800 |
Martin von Zweigbergk |
drawdag: abide by new createmarkers() API
|
changeset |
files
|
| Mon, 24 Feb 2020 14:52:46 -0500 |
Matt Harbison |
lfutil: provide a hint if the largefiles/lfs cache path cannot be determined
|
changeset |
files
|
| Mon, 24 Feb 2020 00:20:47 -0500 |
Matt Harbison |
setup: exclude the __index__ module from itself when generating
stable
|
changeset |
files
|
| Mon, 24 Feb 2020 16:33:10 -0500 |
Matt Harbison |
tests: stabilize test-amend.t on Windows
stable
|
changeset |
files
|
| Mon, 24 Feb 2020 17:43:34 -0500 |
Matt Harbison |
tests: replace truncate(1) with inline python
|
changeset |
files
|
| Mon, 24 Feb 2020 16:59:35 -0500 |
Matt Harbison |
tests: stabilize test-rename-merge2.t on Windows
|
changeset |
files
|
| Mon, 24 Feb 2020 13:50:55 -0500 |
Augie Fackler |
merge with stable
|
changeset |
files
|
| Mon, 24 Feb 2020 13:28:49 +0900 |
Yuya Nishihara |
py3: fix EOL detection in commandserver.channeledinput
stable
|
changeset |
files
|
| Thu, 13 Feb 2020 22:51:17 -0500 |
Valentin Gatien-Baron |
bookmarks: prevent pushes of divergent bookmarks (foo@remote)
|
changeset |
files
|
| Thu, 13 Feb 2020 22:06:57 -0500 |
Valentin Gatien-Baron |
bookmarks: refactor in preparation for next commit
|
changeset |
files
|