Mercurial > evolve
graph
-
evolve: make sure user can recover from conflict (issue6053) stableMon, 04 Mar 2019 03:16:51 +0530, by Sushil khanchi
-
evolve: add test which shows unrecoverable evolve state (issue6053) stableMon, 04 Mar 2019 02:55:38 +0530, by Sushil khanchi
-
evolve: add a test in pubdiv where only merging leads to conflictSat, 02 Mar 2019 02:34:29 +0530, by Sushil khanchi
-
evolve: cover continue case in pubdiv when merging results in same as publicThu, 28 Feb 2019 03:12:39 +0530, by Sushil khanchi
-
evolve: handle a case in pubic-div when merging results in same as publicFri, 22 Feb 2019 01:02:51 +0530, by Sushil khanchi
-
evolve: rename npublicdiv to publicnodeThu, 28 Feb 2019 02:08:58 +0530, by Sushil khanchi
-
evolve: in pubdiv resolution make sure that transaction get closedThu, 28 Feb 2019 02:02:18 +0530, by Sushil khanchi
-
evolve: pin the public cset to local side in merging when solving public divMon, 25 Feb 2019 22:50:24 +0530, by Sushil khanchi
-
evolve: add tests of relocation case in public divergenceSat, 23 Feb 2019 00:47:14 +0530, by Sushil khanchi
-
branching: merge with stableSun, 03 Mar 2019 16:29:32 +0100, by Pierre-Yves David
-
split: make sure hg split preserve the phase of splitting cset (issue6048) stableSat, 02 Mar 2019 01:43:14 +0530, by Sushil khanchi
-
split: add tests which demonstrate the issue6048 stableSat, 02 Mar 2019 01:37:04 +0530, by Sushil khanchi
-
evolve: fix the broken behaviour on div resolution in relocation caseFri, 22 Feb 2019 21:01:06 +0530, by Sushil khanchi
-
evolve: change in a test which demonstrate divergence resolution can breakFri, 22 Feb 2019 23:49:37 +0530, by Sushil khanchi
-
tests: update the title of a test as it's not what it saysFri, 22 Feb 2019 23:57:18 +0530, by Sushil khanchi
-
obsexchange: avoid importing io/StringIO module with a different nameWed, 13 Feb 2019 21:56:29 +0800, by Anton Shestakov
-
evolve: remove unused StringIO importWed, 13 Feb 2019 21:56:05 +0800, by Anton Shestakov
-
evolve: unindent some lines caught by flake8Wed, 13 Feb 2019 21:39:10 +0800, by Anton Shestakov
-
branching: overwrite broken merge with a correct oneWed, 13 Feb 2019 12:46:57 +0100, by Pierre-Yves David
-
branching: merge with stableWed, 13 Feb 2019 19:18:17 +0800, by Anton Shestakov
-
branching: merge with stableTue, 12 Feb 2019 15:03:14 +0100, by Pierre-Yves David
-
obshistory: omit keyword arguments with default values in patch.diffui() calls stableMon, 11 Feb 2019 21:33:02 +0800, by Anton Shestakov
-
branching: merge with stableFri, 08 Feb 2019 17:52:49 +0100, by Pierre-Yves David
-
test: wider another time matching in prev/next lock testing stableFri, 08 Feb 2019 10:21:09 +0100, by Pierre-Yves David
-
branching: merge with stableFri, 08 Feb 2019 09:29:54 +0100, by Pierre-Yves David
-
test: wider time matching in prev/next lock testing stableFri, 08 Feb 2019 09:26:48 +0100, by Pierre-Yves David
-
topic: make topics compatible with branchmap refactorWed, 21 Nov 2018 12:00:46 +0000, by Martijn Pieters
-
prompts: use 1-indexing in revselectionprompt()Wed, 30 Jan 2019 10:03:00 -0800, by Martin von Zweigbergk
-
test-split: split now ignores diff.* settingsThu, 07 Feb 2019 16:24:59 +0800, by Anton Shestakov
-
pick: add --tool for hg pick to specify mergetoolSun, 03 Feb 2019 17:03:02 +0530, by Sangeet Kumar Mishra
-
revset: use getintrange() to parse relation subscriptWed, 06 Feb 2019 13:49:29 +0800, by Anton Shestakov
-
branching: merge with stableSun, 03 Feb 2019 12:04:50 +0100, by Pierre-Yves David
-
compat: pass contexts to _findlimit() (issue6066) stableThu, 31 Jan 2019 15:38:48 +0530, by Sushil khanchi
-
changelog: add relevant entriesWed, 30 Jan 2019 04:45:40 +0100, by Pierre-Yves David
-
evolve: add test for the case where public divergence on difference parentsTue, 22 Jan 2019 18:40:10 +0530, by Sushil khanchi
-
evolve: update the public divergence resolution logic to cover --continue caseMon, 21 Jan 2019 23:06:10 +0530, by Sushil khanchi
-
evolve: add logic to resolve content-divergence with a public csetMon, 21 Jan 2019 23:06:34 +0530, by Sushil khanchi
-
evolve: introduce function to create a obsmarker relation even for public csetSun, 13 Jan 2019 19:33:19 +0530, by Sushil khanchi
-
topic: make ranges work in revset relations like 'foo#stack[1:2]'Tue, 29 Jan 2019 20:45:14 +0800, by Anton Shestakov
-
topic: simplify #stack index check/accessMon, 28 Jan 2019 22:31:31 +0800, by Anton Shestakov
-
topic: make ranges work in revset relations like 'foo#topic[1:2]'Sun, 27 Jan 2019 17:39:09 +0800, by Anton Shestakov
-
evolve: add description of function solveobswdpFri, 25 Jan 2019 16:51:36 +0530, by Sushil khanchi
-
evolve: document the "if not shouldupdate" blockWed, 23 Jan 2019 12:11:36 -0800, by Martin von Zweigbergk
-
evolve: make "startnode" consistently be a node, not a contextWed, 23 Jan 2019 11:55:20 -0800, by Martin von Zweigbergk
-
evolve: use context managers for locks and transactionTue, 22 Jan 2019 22:36:29 -0800, by Martin von Zweigbergk
-
prune: use scmutil.cleanupnodes()Tue, 22 Jan 2019 10:17:58 -0800, by Martin von Zweigbergk
-
uncommit: use scmtutil.cleanupnodes()Tue, 22 Jan 2019 10:45:16 -0800, by Martin von Zweigbergk
-
amend: use scmutil.cleanupnodes() with --patchTue, 22 Jan 2019 10:33:02 -0800, by Martin von Zweigbergk
-
pick: use scmutil.cleanupnodes()Tue, 22 Jan 2019 10:32:44 -0800, by Martin von Zweigbergk
-
fold: use scmutil.cleanupnodes()Tue, 22 Jan 2019 09:45:25 -0800, by Martin von Zweigbergk
-
revset: subscriptrelations functions now have two boundsSat, 26 Jan 2019 23:58:18 +0800, by Anton Shestakov
-
branching: merge with stableWed, 23 Jan 2019 15:49:44 -0500, by Pierre-Yves David
-
Added tag 8.4.0 for changeset 8c4289d0e91e stableWed, 23 Jan 2019 15:46:38 -0500, by Pierre-Yves David
-
minitopic: add warning about extensions state and testing stableWed, 23 Jan 2019 09:05:12 -0500, by Pierre-Yves David
-
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4Tue, 22 Jan 2019 12:57:25 -0500, by Pierre-Yves David
-
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5Tue, 22 Jan 2019 12:55:09 -0500, by Pierre-Yves David
-
branching: closing test-compat branch for mercurial-4.3 mercurial-4.3Tue, 22 Jan 2019 12:59:33 -0500, by Pierre-Yves David