evolve: revision graph

graph

less more | rev 4485: (0) -3000 -1000 -112 +112 +1000 tip

pick: update working dir branch (issue6089) stable
Sat, 23 Feb 2019 15:17:55 +0100, by Manuel Jacob
tests: rename test-grab to test-pick stable
Wed, 10 Apr 2019 15:47:28 +0200, by Pierre-Yves David
evolve: make sure div resolution don't replace the initial author (issue6113) stable
Wed, 10 Apr 2019 15:37:29 +0200, by Sushil khanchi
evolve: add test which demonstrate issue6113 stable
Wed, 10 Apr 2019 15:26:41 +0200, by Sushil khanchi
test: consolidate the content-divergent test cases stable
Wed, 10 Apr 2019 14:32:00 +0200, by Pierre-Yves David
changelog: mention the fix to issue6057 stable
Tue, 09 Apr 2019 21:16:49 +0200, by Pierre-Yves David
extensions: avoid enabling evolve for unrelated repositories (issue6057) stable
Tue, 09 Apr 2019 20:45:36 +0200, by Pierre-Yves David
stack: improve set combination logic
Sat, 06 Apr 2019 15:50:15 +0200, by Anton Shestakov
stack: fix phasecache._phasesets check logic
Sat, 06 Apr 2019 15:49:22 +0200, by Anton Shestakov
evolve: remove todo markers from a test which has been fixed
Tue, 02 Apr 2019 12:41:57 +0530, by Sushil khanchi
next: clarify tests related to `commands.update.check` test
Fri, 05 Apr 2019 22:28:07 +0200, by Pierre-Yves David
stack: simplify phasecache checks in _stackcandidates()
Wed, 03 Apr 2019 17:20:34 +0800, by Anton Shestakov
evolve: fix divergence resolution when not merging a descendant
Fri, 05 Apr 2019 17:45:59 +0200, by Pierre-Yves David
test: fix a phase divergence test case to actually not contains conflict
Fri, 29 Mar 2019 15:15:07 +0100, by Pierre-Yves David
tests: use current instability names everywhere
Fri, 05 Apr 2019 16:31:45 +0200, by Pierre-Yves David
test: apply unstability resolution to `test-unstability-resolution-result.t`
Thu, 04 Apr 2019 12:24:28 +0200, by Pierre-Yves David
test: rename and clarify content of test-unstable-content-divergent.t
Thu, 04 Apr 2019 12:06:33 +0200, by Pierre-Yves David
test: rename and clarify content of test-unstable-orphan.t
Thu, 04 Apr 2019 11:53:05 +0200, by Pierre-Yves David
evolve: refactor the code which swap two nodes (in divergence resolution)
Wed, 03 Apr 2019 01:00:33 +0530, by Sushil khanchi
evolve: remove tmpctx arg from _resolvephasedivergent()
Tue, 02 Apr 2019 18:01:43 +0530, by Sushil khanchi
doc: clarify _resolvephasedivergent role and constraint
Fri, 29 Mar 2019 11:48:36 +0100, by Pierre-Yves David
branching: merge with stable
Tue, 02 Apr 2019 20:32:15 +0200, by Pierre-Yves David
evolve: unindent some lines caught by flake8 stable
Wed, 13 Feb 2019 21:39:10 +0800, by Anton Shestakov
obsexchange: avoid importing io/StringIO module with a different name stable
Wed, 13 Feb 2019 21:56:29 +0800, by Anton Shestakov
evolve: remove unused StringIO import stable
Wed, 13 Feb 2019 21:56:05 +0800, by Anton Shestakov
compat: add support for new arg name in memfilectx.__init__ stable
Fri, 22 Mar 2019 09:45:07 -0700, by Martin von Zweigbergk
topic: make topics compatible with branchmap refactor stable
Wed, 21 Nov 2018 12:00:46 +0000, by Martijn Pieters
evolve: compat patch to fix broken evolve obsdiscovery
Fri, 29 Mar 2019 11:19:24 +0100, by Sushil khanchi
tests: add obslog output to some tests for divergence resolution
Thu, 28 Mar 2019 15:05:57 -0700, by Martin von Zweigbergk
tests: add tests for divergence resolution with split+amend
Thu, 28 Mar 2019 14:54:46 -0700, by Martin von Zweigbergk
test: use 'split' instead of 'splitted' in the tests
Tue, 26 Mar 2019 12:53:50 +0100, by Pierre-Yves David
evolve: drop the "computing new diff message" for phase-divergence
Tue, 26 Mar 2019 12:30:10 +0100, by Pierre-Yves David
evolve: clarify output when phase-divergence resolution results in no change
Wed, 20 Mar 2019 09:19:02 -0700, by Martin von Zweigbergk
tests: reduce dependence on previous tests for setup
Tue, 12 Mar 2019 09:44:05 -0700, by Martin von Zweigbergk
branching: merge with stable
Thu, 28 Mar 2019 12:37:55 +0100, by Pierre-Yves David
topicmap: add compatibility for branchcache that now uses self._entries stable
Wed, 27 Mar 2019 20:52:30 +0800, by Anton Shestakov
evolve: fix over-idented block stable
Wed, 27 Mar 2019 14:29:22 +0530, by Sushil khanchi
tests: create "private" repository in already-updated state
Tue, 12 Mar 2019 09:48:05 -0700, by Martin von Zweigbergk
branching: merge with stable
Tue, 26 Mar 2019 11:23:09 +0100, by Pierre-Yves David
touch: use action "touch", not "<function touch at ...>", in precheck stable
Mon, 25 Mar 2019 15:45:11 -0700, by Martin von Zweigbergk
prune: use action "prune", not "touch", in precheck stable
Mon, 25 Mar 2019 15:44:44 -0700, by Martin von Zweigbergk
evolve: test a common case of public divergence
Sun, 24 Mar 2019 21:30:12 +0530, by Pierre-Yves David
evolve: add condition in case of pubdiv to not swap the two div csets
Sun, 24 Mar 2019 21:29:44 +0530, by Sushil khanchi
evolve: add logic to handle a particular case in divergence resolution
Sat, 23 Mar 2019 02:10:31 +0530, by Sushil khanchi
evolve: add a test reflecting wrong behaviour of content-div resolution
Fri, 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 versions
Wed, 13 Mar 2019 17:32:14 +0530, by Sushil khanchi
evolve: warn user if cset desc is being lost
Sat, 09 Mar 2019 19:25:34 +0530, by Sushil khanchi
changelog: mention latest improvement
Sun, 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 symbol
Sat, 09 Mar 2019 13:13:53 +0800, by Anton Shestakov
stack: handle external-children just like other states
Sat, 09 Mar 2019 12:54:00 +0800, by Anton Shestakov
stack: optimize revset used for stack --children
Thu, 07 Mar 2019 22:50:56 +0800, by Anton Shestakov
stack: rename unstable -> orphan
Thu, 07 Mar 2019 19:13:45 +0800, by Anton Shestakov
evolvecmd: compatibility with older geteffectflag() that took a tuple
Wed, 06 Mar 2019 21:47:08 +0800, by Anton Shestakov
obshistory: remove unused geteffectflag(), it's been in core since 4.4
Wed, 06 Mar 2019 21:42:32 +0800, by Anton Shestakov
compat: remove old vocabulary change fallbacks
Wed, 06 Mar 2019 16:56:25 +0800, by Anton Shestakov
branching: merge with stable
Thu, 07 Mar 2019 10:51:48 +0100, by Pierre-Yves David
evolve: fix a typo from directory to dirty stable
Thu, 07 Mar 2019 01:57:43 +0530, by Sushil khanchi
evolve: fix the dirstate after setting parents with dirty wdir (issue5930) stable
Thu, 07 Mar 2019 01:47:14 +0530, by Sushil khanchi
evolve: add tests which shows evolve can get confused about copies (issue5930) stable
Thu, 07 Mar 2019 01:02:05 +0530, by Sushil khanchi
test: include some documentation to describe the case briefly stable
Tue, 05 Mar 2019 21:15:05 +0530, by Sushil khanchi
split: use ui.configoverride to preserve phase while commiting stable
Tue, 05 Mar 2019 20:07:23 +0530, by Sushil khanchi
branching: merge with stable
Mon, 04 Mar 2019 12:30:15 +0100, by Pierre-Yves David
changelog: add entries for the recent fixes stable
Mon, 04 Mar 2019 11:54:49 +0100, by Pierre-Yves David
evolve: make sure user can recover from conflict (issue6053) stable
Mon, 04 Mar 2019 03:16:51 +0530, by Sushil khanchi
evolve: add test which shows unrecoverable evolve state (issue6053) stable
Mon, 04 Mar 2019 02:55:38 +0530, by Sushil khanchi
evolve: add a test in pubdiv where only merging leads to conflict
Sat, 02 Mar 2019 02:34:29 +0530, by Sushil khanchi
evolve: cover continue case in pubdiv when merging results in same as public
Thu, 28 Feb 2019 03:12:39 +0530, by Sushil khanchi
evolve: handle a case in pubic-div when merging results in same as public
Fri, 22 Feb 2019 01:02:51 +0530, by Sushil khanchi
evolve: rename npublicdiv to publicnode
Thu, 28 Feb 2019 02:08:58 +0530, by Sushil khanchi
evolve: in pubdiv resolution make sure that transaction get closed
Thu, 28 Feb 2019 02:02:18 +0530, by Sushil khanchi
evolve: pin the public cset to local side in merging when solving public div
Mon, 25 Feb 2019 22:50:24 +0530, by Sushil khanchi
evolve: add tests of relocation case in public divergence
Sat, 23 Feb 2019 00:47:14 +0530, by Sushil khanchi
branching: merge with stable
Sun, 03 Mar 2019 16:29:32 +0100, by Pierre-Yves David
split: make sure hg split preserve the phase of splitting cset (issue6048) stable
Sat, 02 Mar 2019 01:43:14 +0530, by Sushil khanchi
split: add tests which demonstrate the issue6048 stable
Sat, 02 Mar 2019 01:37:04 +0530, by Sushil khanchi
evolve: fix the broken behaviour on div resolution in relocation case
Fri, 22 Feb 2019 21:01:06 +0530, by Sushil khanchi
evolve: change in a test which demonstrate divergence resolution can break
Fri, 22 Feb 2019 23:49:37 +0530, by Sushil khanchi
tests: update the title of a test as it's not what it says
Fri, 22 Feb 2019 23:57:18 +0530, by Sushil khanchi
obsexchange: avoid importing io/StringIO module with a different name
Wed, 13 Feb 2019 21:56:29 +0800, by Anton Shestakov
evolve: remove unused StringIO import
Wed, 13 Feb 2019 21:56:05 +0800, by Anton Shestakov
evolve: unindent some lines caught by flake8
Wed, 13 Feb 2019 21:39:10 +0800, by Anton Shestakov
branching: overwrite broken merge with a correct one
Wed, 13 Feb 2019 12:46:57 +0100, by Pierre-Yves David
branching: merge with stable
Wed, 13 Feb 2019 19:18:17 +0800, by Anton Shestakov
branching: merge with stable
Tue, 12 Feb 2019 15:03:14 +0100, by Pierre-Yves David
obshistory: omit keyword arguments with default values in patch.diffui() calls stable
Mon, 11 Feb 2019 21:33:02 +0800, by Anton Shestakov
branching: merge with stable
Fri, 08 Feb 2019 17:52:49 +0100, by Pierre-Yves David
test: wider another time matching in prev/next lock testing stable
Fri, 08 Feb 2019 10:21:09 +0100, by Pierre-Yves David
branching: merge with stable
Fri, 08 Feb 2019 09:29:54 +0100, by Pierre-Yves David
test: wider time matching in prev/next lock testing stable
Fri, 08 Feb 2019 09:26:48 +0100, by Pierre-Yves David
topic: make topics compatible with branchmap refactor
Wed, 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.* settings
Thu, 07 Feb 2019 16:24:59 +0800, by Anton Shestakov
pick: add --tool for hg pick to specify mergetool
Sun, 03 Feb 2019 17:03:02 +0530, by Sangeet Kumar Mishra
revset: use getintrange() to parse relation subscript
Wed, 06 Feb 2019 13:49:29 +0800, by Anton Shestakov
branching: merge with stable
Sun, 03 Feb 2019 12:04:50 +0100, by Pierre-Yves David
compat: pass contexts to _findlimit() (issue6066) stable
Thu, 31 Jan 2019 15:38:48 +0530, by Sushil khanchi
packaging: fix debian changelog stable
Sun, 03 Feb 2019 08:10:48 +0100, by Pierre-Yves David
changelog: add relevant entries
Wed, 30 Jan 2019 04:45:40 +0100, by Pierre-Yves David
evolve: add test for the case where public divergence on difference parents
Tue, 22 Jan 2019 18:40:10 +0530, by Sushil khanchi
evolve: update the public divergence resolution logic to cover --continue case
Mon, 21 Jan 2019 23:06:10 +0530, by Sushil khanchi
evolve: add logic to resolve content-divergence with a public cset
Mon, 21 Jan 2019 23:06:34 +0530, by Sushil khanchi
evolve: introduce function to create a obsmarker relation even for public cset
Sun, 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/access
Mon, 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 solveobswdp
Fri, 25 Jan 2019 16:51:36 +0530, by Sushil khanchi
evolve: document the "if not shouldupdate" block
Wed, 23 Jan 2019 12:11:36 -0800, by Martin von Zweigbergk
evolve: make "startnode" consistently be a node, not a context
Wed, 23 Jan 2019 11:55:20 -0800, by Martin von Zweigbergk
evolve: use context managers for locks and transaction
Tue, 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

less more | rev 4485: (0) -3000 -1000 -112 +112 +1000 tip

Mercurial > evolve

graph