Mercurial > evolve
graph
-
evolve: remove tmpctx arg from _resolvephasedivergent()Tue, 02 Apr 2019 18:01:43 +0530, by Sushil khanchi
-
doc: clarify _resolvephasedivergent role and constraintFri, 29 Mar 2019 11:48:36 +0100, by Pierre-Yves David
-
branching: merge with stableTue, 02 Apr 2019 20:32:15 +0200, by Pierre-Yves David
-
evolve: unindent some lines caught by flake8 stableWed, 13 Feb 2019 21:39:10 +0800, by Anton Shestakov
-
obsexchange: avoid importing io/StringIO module with a different name stableWed, 13 Feb 2019 21:56:29 +0800, by Anton Shestakov
-
compat: add support for new arg name in memfilectx.__init__ stableFri, 22 Mar 2019 09:45:07 -0700, by Martin von Zweigbergk
-
topic: make topics compatible with branchmap refactor stableWed, 21 Nov 2018 12:00:46 +0000, by Martijn Pieters
-
evolve: compat patch to fix broken evolve obsdiscoveryFri, 29 Mar 2019 11:19:24 +0100, by Sushil khanchi
-
tests: add obslog output to some tests for divergence resolutionThu, 28 Mar 2019 15:05:57 -0700, by Martin von Zweigbergk
-
tests: add tests for divergence resolution with split+amendThu, 28 Mar 2019 14:54:46 -0700, by Martin von Zweigbergk
-
test: use 'split' instead of 'splitted' in the testsTue, 26 Mar 2019 12:53:50 +0100, by Pierre-Yves David
-
evolve: drop the "computing new diff message" for phase-divergenceTue, 26 Mar 2019 12:30:10 +0100, by Pierre-Yves David
-
evolve: clarify output when phase-divergence resolution results in no changeWed, 20 Mar 2019 09:19:02 -0700, by Martin von Zweigbergk
-
tests: reduce dependence on previous tests for setupTue, 12 Mar 2019 09:44:05 -0700, by Martin von Zweigbergk
-
branching: merge with stableThu, 28 Mar 2019 12:37:55 +0100, by Pierre-Yves David
-
topicmap: add compatibility for branchcache that now uses self._entries stableWed, 27 Mar 2019 20:52:30 +0800, by Anton Shestakov
-
tests: create "private" repository in already-updated stateTue, 12 Mar 2019 09:48:05 -0700, by Martin von Zweigbergk
-
branching: merge with stableTue, 26 Mar 2019 11:23:09 +0100, by Pierre-Yves David
-
touch: use action "touch", not "<function touch at ...>", in precheck stableMon, 25 Mar 2019 15:45:11 -0700, by Martin von Zweigbergk
-
prune: use action "prune", not "touch", in precheck stableMon, 25 Mar 2019 15:44:44 -0700, by Martin von Zweigbergk
-
evolve: test a common case of public divergenceSun, 24 Mar 2019 21:30:12 +0530, by Pierre-Yves David
-
evolve: add condition in case of pubdiv to not swap the two div csetsSun, 24 Mar 2019 21:29:44 +0530, by Sushil khanchi
-
evolve: add logic to handle a particular case in divergence resolutionSat, 23 Mar 2019 02:10:31 +0530, by Sushil khanchi
-
evolve: add a test reflecting wrong behaviour of content-div resolutionFri, 22 Mar 2019 00:16:44 +0530, by Sushil khanchi
-
compat: add support for new arg name in memfilectx.__init__Fri, 22 Mar 2019 09:45:07 -0700, by Martin von Zweigbergk
-
evolve: preserve compatibility for hg < 4.8 versionsWed, 13 Mar 2019 17:32:14 +0530, by Sushil khanchi
-
evolve: warn user if cset desc is being lostSat, 09 Mar 2019 19:25:34 +0530, by Sushil khanchi
-
changelog: mention latest improvementSun, 10 Mar 2019 18:00:08 +0100, by Pierre-Yves David
-
stack: make @ (current) more important than $ (some sort of unstable)Sun, 10 Mar 2019 18:50:00 +0800, by Anton Shestakov
-
stack: show content and phase divergent state and symbolSat, 09 Mar 2019 13:13:53 +0800, by Anton Shestakov
-
stack: handle external-children just like other statesSat, 09 Mar 2019 12:54:00 +0800, by Anton Shestakov
-
stack: optimize revset used for stack --childrenThu, 07 Mar 2019 22:50:56 +0800, by Anton Shestakov
-
stack: rename unstable -> orphanThu, 07 Mar 2019 19:13:45 +0800, by Anton Shestakov
-
evolvecmd: compatibility with older geteffectflag() that took a tupleWed, 06 Mar 2019 21:47:08 +0800, by Anton Shestakov
-
obshistory: remove unused geteffectflag(), it's been in core since 4.4Wed, 06 Mar 2019 21:42:32 +0800, by Anton Shestakov
-
compat: remove old vocabulary change fallbacksWed, 06 Mar 2019 16:56:25 +0800, by Anton Shestakov
-
branching: merge with stableThu, 07 Mar 2019 10:51:48 +0100, by Pierre-Yves David
-
evolve: fix a typo from directory to dirty stableThu, 07 Mar 2019 01:57:43 +0530, by Sushil khanchi
-
evolve: fix the dirstate after setting parents with dirty wdir (issue5930) stableThu, 07 Mar 2019 01:47:14 +0530, by Sushil khanchi
-
evolve: add tests which shows evolve can get confused about copies (issue5930) stableThu, 07 Mar 2019 01:02:05 +0530, by Sushil khanchi
-
test: include some documentation to describe the case briefly stableTue, 05 Mar 2019 21:15:05 +0530, by Sushil khanchi
-
split: use ui.configoverride to preserve phase while commiting stableTue, 05 Mar 2019 20:07:23 +0530, by Sushil khanchi
-
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