| Sun, 29 Apr 2018 19:18:54 +0530 |
Pulkit Goyal |
evolve: show cset hash in "merging conetnt-divergent changeset"
|
| Sun, 29 Apr 2018 19:14:41 +0530 |
Pulkit Goyal |
evolve: show cset hash in "update to local conflict" message
|
| Sun, 29 Apr 2018 19:11:29 +0530 |
Pulkit Goyal |
evolve: use hg.updaterepo() instead of hg.update() to hide stats
|
| Sun, 29 Apr 2018 19:04:18 +0530 |
Pulkit Goyal |
evolve: fix the conflicts error message during content-divergence resolution
|
| Sun, 29 Apr 2018 18:51:56 +0530 |
Pulkit Goyal |
evolve: add logic to continue interrupted content-divergence resolution
|
| Sun, 29 Apr 2018 18:48:36 +0530 |
Pulkit Goyal |
evolve: store the evolvestate file when encountering conflicts
|
| Sun, 29 Apr 2018 18:13:29 +0530 |
Pulkit Goyal |
evolve: take out logic to complete phase-divergence in separate fn
|
| Sun, 29 Apr 2018 17:54:01 +0530 |
Pulkit Goyal |
evolve: store divergent nodes in evolvestate when resolving content-divergence
|
| Wed, 02 May 2018 11:59:06 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
| Sat, 28 Apr 2018 18:44:07 +0530 |
Pulkit Goyal |
tests: add test showing `hg evolve --stop` works fine with phase-divergence
stable
|
| Sat, 28 Apr 2018 18:03:32 +0530 |
Pulkit Goyal |
tests: rename the test file to add 'orphan' in the name
stable
|
| Fri, 27 Apr 2018 16:28:34 +0800 |
Anton Shestakov |
tests: test that `hg obslog wdir()` aborts with a useful message
stable
|
| Fri, 27 Apr 2018 16:19:45 +0800 |
Anton Shestakov |
obshistory: make obslog work when a commit doesn't have any description
stable
|
| Fri, 27 Apr 2018 16:14:10 +0800 |
Anton Shestakov |
obshistory: use a more appropriate type for obslog entries
stable
|
| Wed, 25 Apr 2018 14:19:13 +0100 |
Pierre-Yves David |
packaging: mark as development version
|
| Wed, 25 Apr 2018 14:18:19 +0100 |
Pierre-Yves David |
branching: merge with latest release
|
| Wed, 25 Apr 2018 14:16:35 +0100 |
Pierre-Yves David |
packaking: mark as development version
stable
|
| Wed, 25 Apr 2018 14:09:36 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
| Wed, 25 Apr 2018 14:09:35 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
| Wed, 25 Apr 2018 14:09:34 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.5
mercurial-4.5
|
| Wed, 25 Apr 2018 14:09:14 +0100 |
Pierre-Yves David |
Added tag 8.0.0 for changeset 116cdd8c102a
stable
|
| Wed, 25 Apr 2018 14:02:43 +0100 |
Pierre-Yves David |
packaging: update version number
stable 8.0.0
|
| Wed, 25 Apr 2018 13:55:52 +0100 |
Pierre-Yves David |
packagin: update `tested-with` statement
stable
|
| Wed, 25 Apr 2018 13:49:00 +0100 |
Pierre-Yves David |
changelog: mention 4.6 compatibility
stable
|
| Wed, 25 Apr 2018 11:55:49 +0100 |
Pierre-Yves David |
Changelog: pre-version gardening
stable
|
| Wed, 25 Apr 2018 01:58:45 +0100 |
Pierre-Yves David |
testcompat: update output for Mercurial 4.3
mercurial-4.3
|
| Mon, 23 Apr 2018 12:23:00 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
| Mon, 23 Apr 2018 12:11:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
| Tue, 24 Apr 2018 08:57:18 +0100 |
Pierre-Yves David |
testcompat: revert output change from new capabilities
mercurial-4.5
|
| Tue, 24 Apr 2018 08:42:47 +0100 |
Pierre-Yves David |
testcompat: revert output change from 54a469cd5b26
mercurial-4.5
|
| Tue, 24 Apr 2018 08:41:57 +0100 |
Pierre-Yves David |
testcompat: revert output change from 1de6ba0ac6d7
mercurial-4.5
|
| Mon, 23 Apr 2018 12:10:26 +0200 |
Pierre-Yves David |
testcompat: merge stable into mercurial-4.5
mercurial-4.5
|
| Tue, 24 Apr 2018 15:23:15 +0100 |
Pierre-Yves David |
compat: handle different `ui.edit` signature with Mercurial 4.3
stable
|
| Tue, 24 Apr 2018 16:13:42 +0100 |
Pierre-Yves David |
wirepeer: try modern module first
stable
|
| Tue, 24 Apr 2018 12:07:35 +0100 |
Pierre-Yves David |
compat: handle lack of allpredecessors for Mercurial 4.3
stable
|
| Mon, 23 Apr 2018 12:03:05 +0100 |
Pierre-Yves David |
branching: merge further fix into stable
stable
|
| Mon, 23 Apr 2018 11:44:05 +0100 |
Pierre-Yves David |
wrapping: fix a silly error were we checking on module and wrapping the other
|
| Mon, 23 Apr 2018 11:04:27 +0200 |
Pierre-Yves David |
brancing: merge next release into default
stable
|
| Sat, 21 Apr 2018 11:01:12 +0200 |
Pierre-Yves David |
test-compat: open mercurial-4.5 branch
mercurial-4.5
|
| Sun, 22 Apr 2018 11:40:17 +0200 |
Pierre-Yves David |
evolve: point to '--abort' in error message
|
| Thu, 19 Apr 2018 16:27:13 +0200 |
Pierre-Yves David |
compat: drop compatibility layer for pager
|
| Thu, 19 Apr 2018 16:25:17 +0200 |
Pierre-Yves David |
compat: drop compatibility layer for duplicatecopies
|
| Thu, 19 Apr 2018 16:21:44 +0200 |
Pierre-Yves David |
compat: drop compatibility layer for bookmark.applychanges
|
| Thu, 19 Apr 2018 16:15:10 +0200 |
Pierre-Yves David |
compat: from compatibility layer for allprecursors
|
| Thu, 19 Apr 2018 16:12:37 +0200 |
Pierre-Yves David |
compat: drop compatibility layer for successorssets
|
| Thu, 19 Apr 2018 16:08:01 +0200 |
Pierre-Yves David |
compat: drop compatibility wrapper for "relevantmarkers"
|
| Thu, 19 Apr 2018 16:51:53 +0200 |
Pierre-Yves David |
compat: drop compat layer for cleanupnodes
|
| Thu, 19 Apr 2018 16:07:23 +0200 |
Pierre-Yves David |
compat: from compatibility layer for createmarkers
|
| Thu, 19 Apr 2018 16:01:49 +0200 |
Pierre-Yves David |
compat: drop obsutile layer
|
| Thu, 19 Apr 2018 15:59:39 +0200 |
Pierre-Yves David |
compat: drop vfsmod compat layer
|
| Thu, 19 Apr 2018 14:26:03 +0200 |
Pierre-Yves David |
evolve: use in code filtered error for 4.6
|
| Thu, 19 Apr 2018 15:51:44 +0200 |
Pierre-Yves David |
documentation: refer to 4.3 in the help text
|
| Thu, 19 Apr 2018 14:14:34 +0200 |
Pierre-Yves David |
topic: remove compatibility for older version in discovery wrapping
|
| Thu, 19 Apr 2018 14:01:24 +0200 |
Pierre-Yves David |
obscache: drop compat layer to access public changeset
|
| Thu, 19 Apr 2018 14:00:12 +0200 |
Pierre-Yves David |
obscache: drop compat layer for obsmarkers reading
|
| Thu, 19 Apr 2018 13:40:57 +0200 |
Pierre-Yves David |
template: drop compatibility layer
|
