| 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
|
| Sat, 15 Feb 2020 14:51:33 -0500 |
Valentin Gatien-Baron |
bookmarks: avoid traceback when two pushes race to delete the same bookmark
|
changeset |
files
|
| Sat, 15 Feb 2020 15:06:41 -0500 |
Valentin Gatien-Baron |
relnotes: add entry about previous `hg recover` change
|
changeset |
files
|
| Thu, 20 Feb 2020 15:15:23 -0800 |
Kyle Lippincott |
darwin: add another preemptive gui() call when using chg
|
changeset |
files
|
| Fri, 20 Dec 2019 13:24:46 -0800 |
Martin von Zweigbergk |
copy: add experimental support for marking committed copies
|
changeset |
files
|
| Thu, 26 Dec 2019 14:02:50 -0800 |
Martin von Zweigbergk |
copy: move argument validation a little earlier
|
changeset |
files
|
| Tue, 28 Jan 2020 14:07:57 -0800 |
Martin von Zweigbergk |
copy: add experimetal support for unmarking committed copies
|
changeset |
files
|
| Fri, 20 Dec 2019 15:50:13 -0800 |
Martin von Zweigbergk |
copy: add option to unmark file as copied
|
changeset |
files
|
| Tue, 11 Feb 2020 11:18:52 +0100 |
Pierre-Yves David |
nodemap: introduce an option to use mmap to read the nodemap mapping
|
changeset |
files
|
| Fri, 14 Feb 2020 15:03:26 +0100 |
Raphaël Gomès |
rust-dirstatemap: directly return `non_normal` and `other_entries`
|
changeset |
files
|
| Thu, 26 Dec 2019 14:12:45 -0800 |
Martin von Zweigbergk |
copy: rename `wctx` to `ctx` since it will not necessarily be working copy
|
changeset |
files
|
| Fri, 20 Dec 2019 14:03:12 -0800 |
Martin von Zweigbergk |
copy: rewrite walkpat() to depend less on dirstate
|
changeset |
files
|
| Thu, 13 Feb 2020 10:12:12 -0800 |
Martin von Zweigbergk |
merge with stable
|
changeset |
files
|
| Sat, 01 Feb 2020 12:57:32 +0900 |
Yuya Nishihara |
pathutil: resurrect comment about path auditing order
|
changeset |
files
|
| Wed, 16 Oct 2019 14:12:48 +0200 |
Raphaël Gomès |
rust-dirstatemap: remove additional lookup in dirstate.matches
|
changeset |
files
|
| Tue, 31 Dec 2019 12:43:57 +0100 |
Georges Racinet |
rust-nodemap: insert method
|
changeset |
files
|
| Wed, 22 Jan 2020 14:21:34 -0500 |
Valentin Gatien-Baron |
recover: don't verify by default
|
changeset |
files
|
| Tue, 11 Feb 2020 00:08:28 -0500 |
Augie Fackler |
context: use manifest.find() instead of two separate calls
|
changeset |
files
|
| Thu, 16 Jan 2020 23:06:01 +0100 |
Raphaël Gomès |
rust-matchers: implement `visit_children_set` for `FileMatcher`
|
changeset |
files
|
| Wed, 05 Feb 2020 17:13:51 -0500 |
Augie Fackler |
manifest: move matches method to be outside the interface
|
changeset |
files
|
| Mon, 10 Feb 2020 21:02:22 -0500 |
Augie Fackler |
tags: use modern // operator for division
|
changeset |
files
|
| Mon, 10 Feb 2020 20:47:19 -0500 |
Augie Fackler |
tags: fix some type confusion exposed in python 3
|
changeset |
files
|
| Fri, 10 Jan 2020 17:20:12 -0800 |
Martin von Zweigbergk |
rebase: remove some now-unused parent arguments
|
changeset |
files
|
| Fri, 10 Jan 2020 21:40:01 -0800 |
Martin von Zweigbergk |
rebase: remove some redundant setting of dirstate parents
|
changeset |
files
|
| Fri, 10 Jan 2020 14:22:20 -0800 |
Martin von Zweigbergk |
rebase: don't use rebased node as dirstate p2 (BC)
|
changeset |
files
|
| Fri, 10 Jan 2020 14:17:56 -0800 |
Martin von Zweigbergk |
rebase: stop relying on having two parents to resume rebase
|
changeset |
files
|
| Tue, 28 Jan 2020 21:49:50 -0800 |
Martin von Zweigbergk |
graphlog: use '%' for other context in merge conflict
|
changeset |
files
|
| Wed, 29 Jan 2020 14:42:54 -0800 |
Martin von Zweigbergk |
tests: add `hg log -G` output when there are merge conflicts
|
changeset |
files
|
| Wed, 29 Jan 2020 11:30:35 -0800 |
Martin von Zweigbergk |
revset: add a revset for parents in merge state
|
changeset |
files
|
| Fri, 10 Jan 2020 17:46:10 -0800 |
Martin von Zweigbergk |
tests: add test of rebase with conflict in merge commit
|
changeset |
files
|
| Thu, 16 Jan 2020 00:03:19 -0800 |
Martin von Zweigbergk |
rebase: always be graft-like, not merge-like, also for merges
|
changeset |
files
|
| Wed, 15 Jan 2020 15:51:01 +0100 |
Pierre-Yves David |
nodemap: update the index with the newly written data (when appropriate)
|
changeset |
files
|