| Wed, 27 Mar 2019 20:52:30 +0800 |
Anton Shestakov |
topicmap: add compatibility for branchcache that now uses self._entries
stable
|
changeset |
files
|
| Wed, 27 Mar 2019 14:29:22 +0530 |
Sushil khanchi |
evolve: fix over-idented block
stable
|
changeset |
files
|
| Tue, 12 Mar 2019 09:48:05 -0700 |
Martin von Zweigbergk |
tests: create "private" repository in already-updated state
|
changeset |
files
|
| Tue, 26 Mar 2019 11:23:09 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Mon, 25 Mar 2019 15:45:11 -0700 |
Martin von Zweigbergk |
touch: use action "touch", not "<function touch at ...>", in precheck
stable
|
changeset |
files
|
| Mon, 25 Mar 2019 15:44:44 -0700 |
Martin von Zweigbergk |
prune: use action "prune", not "touch", in precheck
stable
|
changeset |
files
|
| Sun, 24 Mar 2019 21:30:12 +0530 |
Pierre-Yves David |
evolve: test a common case of public divergence
|
changeset |
files
|
| Sun, 24 Mar 2019 21:29:44 +0530 |
Sushil khanchi |
evolve: add condition in case of pubdiv to not swap the two div csets
|
changeset |
files
|
| Sat, 23 Mar 2019 02:10:31 +0530 |
Sushil khanchi |
evolve: add logic to handle a particular case in divergence resolution
|
changeset |
files
|
| Fri, 22 Mar 2019 00:16:44 +0530 |
Sushil khanchi |
evolve: add a test reflecting wrong behaviour of content-div resolution
|
changeset |
files
|
| Fri, 22 Mar 2019 09:45:07 -0700 |
Martin von Zweigbergk |
compat: add support for new arg name in memfilectx.__init__
|
changeset |
files
|
| Wed, 13 Mar 2019 17:32:14 +0530 |
Sushil khanchi |
evolve: preserve compatibility for hg < 4.8 versions
|
changeset |
files
|
| Sat, 09 Mar 2019 19:25:34 +0530 |
Sushil khanchi |
evolve: warn user if cset desc is being lost
|
changeset |
files
|
| Sun, 10 Mar 2019 18:00:08 +0100 |
Pierre-Yves David |
changelog: mention latest improvement
|
changeset |
files
|
| Sun, 10 Mar 2019 18:50:00 +0800 |
Anton Shestakov |
stack: make @ (current) more important than $ (some sort of unstable)
|
changeset |
files
|
| Sat, 09 Mar 2019 13:13:53 +0800 |
Anton Shestakov |
stack: show content and phase divergent state and symbol
|
changeset |
files
|
| Sat, 09 Mar 2019 12:54:00 +0800 |
Anton Shestakov |
stack: handle external-children just like other states
|
changeset |
files
|
| Thu, 07 Mar 2019 22:50:56 +0800 |
Anton Shestakov |
stack: optimize revset used for stack --children
|
changeset |
files
|
| Thu, 07 Mar 2019 19:13:45 +0800 |
Anton Shestakov |
stack: rename unstable -> orphan
|
changeset |
files
|
| Wed, 06 Mar 2019 21:47:08 +0800 |
Anton Shestakov |
evolvecmd: compatibility with older geteffectflag() that took a tuple
|
changeset |
files
|
| Wed, 06 Mar 2019 21:42:32 +0800 |
Anton Shestakov |
obshistory: remove unused geteffectflag(), it's been in core since 4.4
|
changeset |
files
|
| Wed, 06 Mar 2019 16:56:25 +0800 |
Anton Shestakov |
compat: remove old vocabulary change fallbacks
|
changeset |
files
|
| Thu, 07 Mar 2019 10:51:48 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Thu, 07 Mar 2019 01:57:43 +0530 |
Sushil khanchi |
evolve: fix a typo from directory to dirty
stable
|
changeset |
files
|
| Thu, 07 Mar 2019 01:47:14 +0530 |
Sushil khanchi |
evolve: fix the dirstate after setting parents with dirty wdir (issue5930)
stable
|
changeset |
files
|
| Thu, 07 Mar 2019 01:02:05 +0530 |
Sushil khanchi |
evolve: add tests which shows evolve can get confused about copies (issue5930)
stable
|
changeset |
files
|
| Tue, 05 Mar 2019 21:15:05 +0530 |
Sushil khanchi |
test: include some documentation to describe the case briefly
stable
|
changeset |
files
|
| Tue, 05 Mar 2019 20:07:23 +0530 |
Sushil khanchi |
split: use ui.configoverride to preserve phase while commiting
stable
|
changeset |
files
|
| Mon, 04 Mar 2019 12:30:15 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Mon, 04 Mar 2019 11:54:49 +0100 |
Pierre-Yves David |
changelog: add entries for the recent fixes
stable
|
changeset |
files
|
| Mon, 04 Mar 2019 03:16:51 +0530 |
Sushil khanchi |
evolve: make sure user can recover from conflict (issue6053)
stable
|
changeset |
files
|
| Mon, 04 Mar 2019 02:55:38 +0530 |
Sushil khanchi |
evolve: add test which shows unrecoverable evolve state (issue6053)
stable
|
changeset |
files
|
| Sat, 02 Mar 2019 02:34:29 +0530 |
Sushil khanchi |
evolve: add a test in pubdiv where only merging leads to conflict
|
changeset |
files
|
| Thu, 28 Feb 2019 03:12:39 +0530 |
Sushil khanchi |
evolve: cover continue case in pubdiv when merging results in same as public
|
changeset |
files
|
| Fri, 22 Feb 2019 01:02:51 +0530 |
Sushil khanchi |
evolve: handle a case in pubic-div when merging results in same as public
|
changeset |
files
|
| Thu, 28 Feb 2019 02:08:58 +0530 |
Sushil khanchi |
evolve: rename npublicdiv to publicnode
|
changeset |
files
|
| Thu, 28 Feb 2019 02:02:18 +0530 |
Sushil khanchi |
evolve: in pubdiv resolution make sure that transaction get closed
|
changeset |
files
|
| Mon, 25 Feb 2019 22:50:24 +0530 |
Sushil khanchi |
evolve: pin the public cset to local side in merging when solving public div
|
changeset |
files
|
| Sat, 23 Feb 2019 00:47:14 +0530 |
Sushil khanchi |
evolve: add tests of relocation case in public divergence
|
changeset |
files
|
| Sun, 03 Mar 2019 16:29:32 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Sat, 02 Mar 2019 01:43:14 +0530 |
Sushil khanchi |
split: make sure hg split preserve the phase of splitting cset (issue6048)
stable
|
changeset |
files
|
| Sat, 02 Mar 2019 01:37:04 +0530 |
Sushil khanchi |
split: add tests which demonstrate the issue6048
stable
|
changeset |
files
|
| Fri, 22 Feb 2019 21:01:06 +0530 |
Sushil khanchi |
evolve: fix the broken behaviour on div resolution in relocation case
|
changeset |
files
|
| Fri, 22 Feb 2019 23:49:37 +0530 |
Sushil khanchi |
evolve: change in a test which demonstrate divergence resolution can break
|
changeset |
files
|
| Fri, 22 Feb 2019 23:57:18 +0530 |
Sushil khanchi |
tests: update the title of a test as it's not what it says
|
changeset |
files
|
| 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
|