Mercurial > evolve
graph
-
branching: merge with stableMon, 04 Mar 2019 12:30:15 +0100, by Pierre-Yves David
-
changelog: add entries for the recent fixes stableMon, 04 Mar 2019 11:54:49 +0100, by Pierre-Yves David
-
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