Mercurial > evolve

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 4475: (0) -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 tip
age author description
Fri, 05 Apr 2019 22:28:07 +0200 Pierre-Yves David next: clarify tests related to `commands.update.check` test
Wed, 03 Apr 2019 17:20:34 +0800 Anton Shestakov stack: simplify phasecache checks in _stackcandidates()
Fri, 05 Apr 2019 17:45:59 +0200 Pierre-Yves David evolve: fix divergence resolution when not merging a descendant
Fri, 29 Mar 2019 15:15:07 +0100 Pierre-Yves David test: fix a phase divergence test case to actually not contains conflict
Fri, 05 Apr 2019 16:31:45 +0200 Pierre-Yves David tests: use current instability names everywhere
Thu, 04 Apr 2019 12:24:28 +0200 Pierre-Yves David test: apply unstability resolution to `test-unstability-resolution-result.t`
Thu, 04 Apr 2019 12:06:33 +0200 Pierre-Yves David test: rename and clarify content of test-unstable-content-divergent.t
Thu, 04 Apr 2019 11:53:05 +0200 Pierre-Yves David test: rename and clarify content of test-unstable-orphan.t
Wed, 03 Apr 2019 01:00:33 +0530 Sushil khanchi evolve: refactor the code which swap two nodes (in divergence resolution)
Tue, 02 Apr 2019 18:01:43 +0530 Sushil khanchi evolve: remove tmpctx arg from _resolvephasedivergent()
Fri, 29 Mar 2019 11:48:36 +0100 Pierre-Yves David doc: clarify _resolvephasedivergent role and constraint
Tue, 02 Apr 2019 20:32:15 +0200 Pierre-Yves David branching: merge with stable
Wed, 13 Feb 2019 21:39:10 +0800 Anton Shestakov evolve: unindent some lines caught by flake8 stable
Wed, 13 Feb 2019 21:56:29 +0800 Anton Shestakov obsexchange: avoid importing io/StringIO module with a different name stable
Wed, 13 Feb 2019 21:56:05 +0800 Anton Shestakov evolve: remove unused StringIO import stable
Fri, 22 Mar 2019 09:45:07 -0700 Martin von Zweigbergk compat: add support for new arg name in memfilectx.__init__ stable
Wed, 21 Nov 2018 12:00:46 +0000 Martijn Pieters topic: make topics compatible with branchmap refactor stable
Fri, 29 Mar 2019 11:19:24 +0100 Sushil khanchi evolve: compat patch to fix broken evolve obsdiscovery
Thu, 28 Mar 2019 15:05:57 -0700 Martin von Zweigbergk tests: add obslog output to some tests for divergence resolution
Thu, 28 Mar 2019 14:54:46 -0700 Martin von Zweigbergk tests: add tests for divergence resolution with split+amend
Tue, 26 Mar 2019 12:53:50 +0100 Pierre-Yves David test: use 'split' instead of 'splitted' in the tests
Tue, 26 Mar 2019 12:30:10 +0100 Pierre-Yves David evolve: drop the "computing new diff message" for phase-divergence
Wed, 20 Mar 2019 09:19:02 -0700 Martin von Zweigbergk evolve: clarify output when phase-divergence resolution results in no change
Tue, 12 Mar 2019 09:44:05 -0700 Martin von Zweigbergk tests: reduce dependence on previous tests for setup
Thu, 28 Mar 2019 12:37:55 +0100 Pierre-Yves David branching: merge with stable
Wed, 27 Mar 2019 20:52:30 +0800 Anton Shestakov topicmap: add compatibility for branchcache that now uses self._entries stable
Wed, 27 Mar 2019 14:29:22 +0530 Sushil khanchi evolve: fix over-idented block stable
Tue, 12 Mar 2019 09:48:05 -0700 Martin von Zweigbergk tests: create "private" repository in already-updated state
Tue, 26 Mar 2019 11:23:09 +0100 Pierre-Yves David branching: merge with stable
Mon, 25 Mar 2019 15:45:11 -0700 Martin von Zweigbergk touch: use action "touch", not "<function touch at ...>", in precheck stable
Mon, 25 Mar 2019 15:44:44 -0700 Martin von Zweigbergk prune: use action "prune", not "touch", in precheck stable
Sun, 24 Mar 2019 21:30:12 +0530 Pierre-Yves David evolve: test a common case of public divergence
Sun, 24 Mar 2019 21:29:44 +0530 Sushil khanchi evolve: add condition in case of pubdiv to not swap the two div csets
Sat, 23 Mar 2019 02:10:31 +0530 Sushil khanchi evolve: add logic to handle a particular case in divergence resolution
Fri, 22 Mar 2019 00:16:44 +0530 Sushil khanchi evolve: add a test reflecting wrong behaviour of content-div resolution
Fri, 22 Mar 2019 09:45:07 -0700 Martin von Zweigbergk compat: add support for new arg name in memfilectx.__init__
Wed, 13 Mar 2019 17:32:14 +0530 Sushil khanchi evolve: preserve compatibility for hg < 4.8 versions
Sat, 09 Mar 2019 19:25:34 +0530 Sushil khanchi evolve: warn user if cset desc is being lost
Sun, 10 Mar 2019 18:00:08 +0100 Pierre-Yves David changelog: mention latest improvement
Sun, 10 Mar 2019 18:50:00 +0800 Anton Shestakov stack: make @ (current) more important than $ (some sort of unstable)
Sat, 09 Mar 2019 13:13:53 +0800 Anton Shestakov stack: show content and phase divergent state and symbol
Sat, 09 Mar 2019 12:54:00 +0800 Anton Shestakov stack: handle external-children just like other states
Thu, 07 Mar 2019 22:50:56 +0800 Anton Shestakov stack: optimize revset used for stack --children
Thu, 07 Mar 2019 19:13:45 +0800 Anton Shestakov stack: rename unstable -> orphan
Wed, 06 Mar 2019 21:47:08 +0800 Anton Shestakov evolvecmd: compatibility with older geteffectflag() that took a tuple
Wed, 06 Mar 2019 21:42:32 +0800 Anton Shestakov obshistory: remove unused geteffectflag(), it's been in core since 4.4
Wed, 06 Mar 2019 16:56:25 +0800 Anton Shestakov compat: remove old vocabulary change fallbacks
Thu, 07 Mar 2019 10:51:48 +0100 Pierre-Yves David branching: merge with stable
Thu, 07 Mar 2019 01:57:43 +0530 Sushil khanchi evolve: fix a typo from directory to dirty stable
Thu, 07 Mar 2019 01:47:14 +0530 Sushil khanchi evolve: fix the dirstate after setting parents with dirty wdir (issue5930) stable
Thu, 07 Mar 2019 01:02:05 +0530 Sushil khanchi evolve: add tests which shows evolve can get confused about copies (issue5930) stable
Tue, 05 Mar 2019 21:15:05 +0530 Sushil khanchi test: include some documentation to describe the case briefly stable
Tue, 05 Mar 2019 20:07:23 +0530 Sushil khanchi split: use ui.configoverride to preserve phase while commiting stable
Mon, 04 Mar 2019 12:30:15 +0100 Pierre-Yves David branching: merge with stable
Mon, 04 Mar 2019 11:54:49 +0100 Pierre-Yves David changelog: add entries for the recent fixes stable
Mon, 04 Mar 2019 03:16:51 +0530 Sushil khanchi evolve: make sure user can recover from conflict (issue6053) stable
Mon, 04 Mar 2019 02:55:38 +0530 Sushil khanchi evolve: add test which shows unrecoverable evolve state (issue6053) stable
Sat, 02 Mar 2019 02:34:29 +0530 Sushil khanchi evolve: add a test in pubdiv where only merging leads to conflict
Thu, 28 Feb 2019 03:12:39 +0530 Sushil khanchi evolve: cover continue case in pubdiv when merging results in same as public
Fri, 22 Feb 2019 01:02:51 +0530 Sushil khanchi evolve: handle a case in pubic-div when merging results in same as public
less more | rev 4475: (0) -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 tip