| Wed, 13 Feb 2019 21:56:29 +0800 |
Anton Shestakov |
obsexchange: avoid importing io/StringIO module with a different name
|
changeset |
files
|
| Wed, 13 Feb 2019 21:56:05 +0800 |
Anton Shestakov |
evolve: remove unused StringIO import
|
changeset |
files
|
| Wed, 13 Feb 2019 21:39:10 +0800 |
Anton Shestakov |
evolve: unindent some lines caught by flake8
|
changeset |
files
|
| Wed, 13 Feb 2019 12:46:57 +0100 |
Pierre-Yves David |
branching: overwrite broken merge with a correct one
|
changeset |
files
|
| Wed, 13 Feb 2019 19:18:17 +0800 |
Anton Shestakov |
branching: merge with stable
|
changeset |
files
|
| Tue, 12 Feb 2019 15:03:14 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Mon, 11 Feb 2019 21:33:02 +0800 |
Anton Shestakov |
obshistory: omit keyword arguments with default values in patch.diffui() calls
stable
|
changeset |
files
|
| Fri, 08 Feb 2019 17:52:49 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Fri, 08 Feb 2019 10:21:09 +0100 |
Pierre-Yves David |
test: wider another time matching in prev/next lock testing
stable
|
changeset |
files
|
| Fri, 08 Feb 2019 09:29:54 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Fri, 08 Feb 2019 09:26:48 +0100 |
Pierre-Yves David |
test: wider time matching in prev/next lock testing
stable
|
changeset |
files
|
| Wed, 21 Nov 2018 12:00:46 +0000 |
Martijn Pieters |
topic: make topics compatible with branchmap refactor
|
changeset |
files
|
| Wed, 30 Jan 2019 10:03:00 -0800 |
Martin von Zweigbergk |
prompts: use 1-indexing in revselectionprompt()
|
changeset |
files
|
| Thu, 07 Feb 2019 16:24:59 +0800 |
Anton Shestakov |
test-split: split now ignores diff.* settings
|
changeset |
files
|
| Sun, 03 Feb 2019 17:03:02 +0530 |
Sangeet Kumar Mishra |
pick: add --tool for hg pick to specify mergetool
|
changeset |
files
|
| Wed, 06 Feb 2019 13:49:29 +0800 |
Anton Shestakov |
revset: use getintrange() to parse relation subscript
|
changeset |
files
|
| Sun, 03 Feb 2019 12:04:50 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Thu, 31 Jan 2019 15:38:48 +0530 |
Sushil khanchi |
compat: pass contexts to _findlimit() (issue6066)
stable
|
changeset |
files
|
| Sun, 03 Feb 2019 08:10:48 +0100 |
Pierre-Yves David |
packaging: fix debian changelog
stable
|
changeset |
files
|
| Wed, 30 Jan 2019 04:45:40 +0100 |
Pierre-Yves David |
changelog: add relevant entries
|
changeset |
files
|
| Tue, 22 Jan 2019 18:40:10 +0530 |
Sushil khanchi |
evolve: add test for the case where public divergence on difference parents
|
changeset |
files
|
| Mon, 21 Jan 2019 23:06:10 +0530 |
Sushil khanchi |
evolve: update the public divergence resolution logic to cover --continue case
|
changeset |
files
|
| Mon, 21 Jan 2019 23:06:34 +0530 |
Sushil khanchi |
evolve: add logic to resolve content-divergence with a public cset
|
changeset |
files
|
| Sun, 13 Jan 2019 19:33:19 +0530 |
Sushil khanchi |
evolve: introduce function to create a obsmarker relation even for public cset
|
changeset |
files
|
| Tue, 29 Jan 2019 20:45:14 +0800 |
Anton Shestakov |
topic: make ranges work in revset relations like 'foo#stack[1:2]'
|
changeset |
files
|
| Mon, 28 Jan 2019 22:31:31 +0800 |
Anton Shestakov |
topic: simplify #stack index check/access
|
changeset |
files
|
| Sun, 27 Jan 2019 17:39:09 +0800 |
Anton Shestakov |
topic: make ranges work in revset relations like 'foo#topic[1:2]'
|
changeset |
files
|
| Fri, 25 Jan 2019 16:51:36 +0530 |
Sushil khanchi |
evolve: add description of function solveobswdp
|
changeset |
files
|
| Wed, 23 Jan 2019 12:11:36 -0800 |
Martin von Zweigbergk |
evolve: document the "if not shouldupdate" block
|
changeset |
files
|
| Wed, 23 Jan 2019 11:55:20 -0800 |
Martin von Zweigbergk |
evolve: make "startnode" consistently be a node, not a context
|
changeset |
files
|
| Tue, 22 Jan 2019 22:36:29 -0800 |
Martin von Zweigbergk |
evolve: use context managers for locks and transaction
|
changeset |
files
|
| Tue, 22 Jan 2019 10:17:58 -0800 |
Martin von Zweigbergk |
prune: use scmutil.cleanupnodes()
|
changeset |
files
|
| Tue, 22 Jan 2019 10:45:16 -0800 |
Martin von Zweigbergk |
uncommit: use scmtutil.cleanupnodes()
|
changeset |
files
|
| Tue, 22 Jan 2019 10:33:02 -0800 |
Martin von Zweigbergk |
amend: use scmutil.cleanupnodes() with --patch
|
changeset |
files
|
| Tue, 22 Jan 2019 10:32:44 -0800 |
Martin von Zweigbergk |
pick: use scmutil.cleanupnodes()
|
changeset |
files
|
| Tue, 22 Jan 2019 09:45:25 -0800 |
Martin von Zweigbergk |
fold: use scmutil.cleanupnodes()
|
changeset |
files
|
| Sat, 26 Jan 2019 23:58:18 +0800 |
Anton Shestakov |
revset: subscriptrelations functions now have two bounds
|
changeset |
files
|
| Wed, 23 Jan 2019 15:49:44 -0500 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 23 Jan 2019 15:48:44 -0500 |
Pierre-Yves David |
packaging: mark as development version
stable
|
changeset |
files
|
| Wed, 23 Jan 2019 15:46:38 -0500 |
Pierre-Yves David |
Added tag 8.4.0 for changeset 8c4289d0e91e
stable
|
changeset |
files
|
| Tue, 22 Jan 2019 20:25:36 -0500 |
Pierre-Yves David |
packaging: prepare release 8.4.0
stable 8.4.0
|
changeset |
files
|
| Wed, 23 Jan 2019 09:05:12 -0500 |
Pierre-Yves David |
minitopic: add warning about extensions state and testing
stable
|
changeset |
files
|
| Tue, 22 Jan 2019 12:57:25 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Tue, 22 Jan 2019 12:55:09 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Tue, 22 Jan 2019 12:59:33 -0500 |
Pierre-Yves David |
branching: closing test-compat branch for mercurial-4.3
mercurial-4.3
|
changeset |
files
|
| Tue, 22 Jan 2019 12:54:44 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Tue, 22 Jan 2019 12:54:43 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Tue, 22 Jan 2019 12:54:41 -0500 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Tue, 22 Jan 2019 12:50:54 -0500 |
Pierre-Yves David |
changelog: explicit the part related to topic
stable
|
changeset |
files
|
| Tue, 22 Jan 2019 10:46:02 -0500 |
Pierre-Yves David |
branching: merge with future version
mercurial-4.8
|
changeset |
files
|
| Tue, 22 Jan 2019 10:43:44 -0500 |
Pierre-Yves David |
branching: start branch for test compat with Mercurial 4.8
mercurial-4.8
|
changeset |
files
|
| Tue, 22 Jan 2019 10:45:09 -0500 |
Pierre-Yves David |
test-compat: reverse test change from 9bce7e6c18b3
mercurial-4.8
|
changeset |
files
|
| Tue, 22 Jan 2019 10:44:49 -0500 |
Pierre-Yves David |
test-compat: reverse test change from db87432df8de
mercurial-4.8
|
changeset |
files
|
| Tue, 22 Jan 2019 10:44:33 -0500 |
Pierre-Yves David |
test-compat: reverse test change from ac39cfb5bddd
mercurial-4.8
|
changeset |
files
|
| Tue, 22 Jan 2019 10:41:53 -0500 |
Pierre-Yves David |
branching: merge stable into default prior to new version
stable
|
changeset |
files
|
| Sat, 19 Jan 2019 21:41:15 +0100 |
Pierre-Yves David |
branching: merge wit stable
|
changeset |
files
|
| Thu, 17 Jan 2019 12:37:40 +0100 |
Pierre-Yves David |
obsdiscovery: use consistent filtering during discovery
|
changeset |
files
|
| Fri, 18 Jan 2019 23:09:44 +0530 |
Sushil khanchi |
evolve: make sure we don't stop after evolution of obsparent (issue5881)
|
changeset |
files
|
| Fri, 18 Jan 2019 23:08:43 +0530 |
Sushil khanchi |
evolve: extract "update" code into its own function
|
changeset |
files
|
| Tue, 25 Dec 2018 16:08:05 +0530 |
Sushil khanchi |
evolve: add test case for issue 5881
|
changeset |
files
|
| Fri, 18 Jan 2019 13:54:30 +0530 |
Sushil khanchi |
evolve: add test which shows fixed behaviour of `hg evolve` (issue5686)
|
changeset |
files
|
| Tue, 25 Dec 2018 14:35:54 +0530 |
Sushil khanchi |
evolve: cover the orphanmerge part missed by lastsolved
|
changeset |
files
|
| Thu, 17 Jan 2019 16:20:35 +0530 |
Sushil khanchi |
evolve: add test which shows orphan-merge resolution can result to crash
|
changeset |
files
|
| Tue, 25 Dec 2018 10:10:12 +0530 |
Sushil khanchi |
next: populate stacktemplate to the missed _nextevolve function
|
changeset |
files
|