| Sun, 01 Dec 2019 12:41:20 +0530 |
Sushil khanchi |
evolve: extract pre merging content-div csets logic to its own function
|
| Thu, 26 Dec 2019 20:28:21 +0100 |
Pierre-Yves David |
evolve: further simplify a conditional
|
| Thu, 26 Dec 2019 20:23:27 +0100 |
Pierre-Yves David |
evolve: simplify some conditional
|
| Thu, 26 Dec 2019 20:17:01 +0100 |
Pierre-Yves David |
evolve: rename some variable ahead of time
|
| Thu, 28 Nov 2019 19:01:28 +0530 |
Sushil khanchi |
evolve: add logic to cover --stop when "divergent" relocation in play
|
| Thu, 28 Nov 2019 17:58:45 +0530 |
Sushil khanchi |
evolve: test to show that --stop is not working when "divergent" relocated
|
| Wed, 27 Nov 2019 22:52:08 +0530 |
Sushil khanchi |
evolve: add test to show that --abort is working fine
|
| Fri, 20 Dec 2019 17:39:44 +0530 |
Sushil khanchi |
evolve: fix a bug in logic to choose destination when no active topic
stable
|
| Fri, 20 Dec 2019 17:32:07 +0530 |
Sushil khanchi |
evolve: add test to demonstrate a bug when no active topic
stable
|
| Fri, 20 Dec 2019 17:31:57 +0530 |
Sushil khanchi |
evolve: fix a bug in logic of choosing destination for hg update
stable
|
| Fri, 20 Dec 2019 17:17:30 +0530 |
Sushil khanchi |
evolve: add test to demonstrate a bug when active topic is empty
stable
|
| Thu, 19 Dec 2019 21:36:59 -0800 |
Martin von Zweigbergk |
evolvecmd: fix a typo node->None
|
| Thu, 19 Dec 2019 21:15:31 -0800 |
Martin von Zweigbergk |
evolvecmd: avoid a ctx->node->ctx conversion
|
| Thu, 19 Dec 2019 13:06:29 -0800 |
Martin von Zweigbergk |
evolvecmd: mark relocate() private
|
| Thu, 19 Dec 2019 22:31:13 -0800 |
Martin von Zweigbergk |
cleanup: replace .parents()[0] by .p1()
|
| Wed, 27 Nov 2019 20:54:48 +0530 |
Sushil khanchi |
evolve: add more tests for --continue case when relocating "divergent"
|
| Wed, 27 Nov 2019 19:50:33 +0530 |
Sushil khanchi |
evolve: use meaningful variable names for a return value
|
| Wed, 27 Nov 2019 12:34:19 +0530 |
Sushil khanchi |
evolve: add logic to cover --continue case when relocating "divergent"
|
| Mon, 25 Nov 2019 21:28:52 +0530 |
Sushil khanchi |
evolve: add test for `--continue` case when relocating "divergent"
|
| Mon, 25 Nov 2019 19:12:51 +0530 |
Sushil khanchi |
evolve: use more specific key name to store in evolvestate
|
| Fri, 13 Dec 2019 01:29:27 +0530 |
Sushil khanchi |
evolve: move a test where it makes more sense
|
| Thu, 12 Dec 2019 17:22:18 +0530 |
Sushil khanchi |
evolve: remove the unnecessary condition to check empty successors set
|
| Tue, 19 Nov 2019 14:54:13 -0800 |
Martin von Zweigbergk |
evolve: delete redundant and incorrect code for updating dirstate
|
| Tue, 19 Nov 2019 14:24:31 -0800 |
Martin von Zweigbergk |
tests: demonstrate how evolve loses transitive copies when interrupted
|
| Mon, 09 Dec 2019 10:36:11 -0800 |
Martin von Zweigbergk |
evolve: use ui.configoverride() instead of ui.backupconfig()
|
| Mon, 09 Dec 2019 10:31:34 -0800 |
Martin von Zweigbergk |
topic: use ui.configoverride() instead of ui.backupconfig()
|
| Mon, 09 Dec 2019 10:28:58 -0800 |
Martin von Zweigbergk |
topic: use ui.configoverride() instead of ui.backupconfig()
|
| Mon, 09 Dec 2019 10:33:48 -0800 |
Martin von Zweigbergk |
evolve: use ui.configoverride() instead of ui.backupconfig()
|
| Mon, 09 Dec 2019 10:43:04 -0800 |
Martin von Zweigbergk |
evolve: remove obsolete backup of allowemptycommit config
|
| Mon, 09 Dec 2019 10:44:42 -0800 |
Martin von Zweigbergk |
evolve: remove dead initilization of "newnode" variable
|
| Thu, 12 Dec 2019 17:16:02 +0530 |
Sushil khanchi |
evolve: fix a typo
|
| Tue, 10 Dec 2019 21:03:51 +0100 |
Pierre-Yves David |
changelog: mention the python 3 fix
stable
|
| Tue, 10 Dec 2019 21:03:23 +0100 |
Pierre-Yves David |
changelog: mention the date fix for content divergence
stable
|
| Tue, 10 Dec 2019 20:47:13 +0100 |
Pierre-Yves David |
branching: merge with stable
|
| Tue, 10 Dec 2019 20:35:56 +0100 |
Denis Laxalde |
py3: fix several TypeError formatting bytes with an exception object
stable
|
| Fri, 11 Oct 2019 21:32:27 +0200 |
Manuel Jacob |
evolve: preserve date when resolving content-divergence (issue6202)
stable
|
| Tue, 10 Dec 2019 19:58:51 +0100 |
Pierre-Yves David |
test: add test for content divergence involving a date update
stable
|
| Tue, 10 Dec 2019 19:55:37 +0100 |
Pierre-Yves David |
test: add test for content divergence involving a date update
stable
|
| Tue, 10 Dec 2019 19:27:55 +0100 |
Pierre-Yves David |
test: add test for content divergence involving a date update
stable
|
| Tue, 10 Dec 2019 19:13:06 +0100 |
Pierre-Yves David |
test: highlight data handling when solving divergence
stable
|
| Sat, 07 Dec 2019 03:27:50 +0530 |
Sushil khanchi |
evolve: add tests for the case when resolution parent is ambiguous
stable
|
| Fri, 06 Dec 2019 23:43:00 +0530 |
Sushil khanchi |
evolve: abort if deciding resolution parent is ambiguous
stable
|
| Sat, 23 Nov 2019 16:17:04 +0530 |
Sushil khanchi |
evolve: make sure divergence resolution doesn't undo changes (issue6203)
stable
|
| Sat, 23 Nov 2019 20:25:16 +0530 |
Sushil khanchi |
evolve: add test to demonstrate issue6203
stable
|
| Mon, 09 Dec 2019 16:01:56 +0700 |
Anton Shestakov |
state: there's no _unpack in struct
stable
|
| Sun, 29 Sep 2019 11:47:18 +0530 |
Sushil khanchi |
amend: abort if both --patch and --extract are used
stable
|
| Mon, 09 Dec 2019 23:54:50 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
| Fri, 06 Dec 2019 17:18:49 +0100 |
Boris Feld |
ci: add job to build and archive the documentation
|
| Thu, 05 Dec 2019 10:04:52 -0800 |
Martin von Zweigbergk |
tests: update now that merge.graft() doesn't set two equal parents
|
| Fri, 06 Dec 2019 14:01:29 +0100 |
Manuel Jacob |
evolve: fix content-divergence resolution when p1 is null (issue6201)
stable
|
| Wed, 04 Dec 2019 10:57:29 -0800 |
Martin von Zweigbergk |
obslog: make {node} the full node and leave shortening to template
|
| Wed, 04 Dec 2019 11:00:00 +0100 |
Pierre-Yves David |
branching: merge with stable
|
| Tue, 03 Dec 2019 09:43:10 -0800 |
Martin von Zweigbergk |
compat: accept "success" argument to lock._afterlock callback
stable
|
| Mon, 02 Dec 2019 20:59:04 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Mon, 02 Dec 2019 20:56:47 +0700 |
Anton Shestakov |
test-compat: run tests with -j more than 1
mercurial-4.7
|
| Mon, 02 Dec 2019 14:44:31 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
