Mercurial > evolve

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 5624: (0) -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 tip
age author description
Sat, 31 Oct 2020 17:38:11 +0800 Anton Shestakov changelog: update for evolve 10.1.0 stable
Sat, 31 Oct 2020 17:25:32 +0800 Anton Shestakov branching: merge into stable in preparation for release stable
Sat, 31 Oct 2020 02:36:21 +0800 Anton Shestakov changelog: update for 10.0.3 stable
Sat, 31 Oct 2020 02:34:31 +0800 Anton Shestakov changelog: update for 10.1.0
Wed, 28 Oct 2020 20:24:26 +0100 Pierre-Yves David branching: merge stable into default
Sat, 19 Sep 2020 17:49:31 +0200 Anton Shestakov evolve: clean merge state when content divergence resolution has no changes stable
Fri, 08 May 2020 19:49:07 +0800 Anton Shestakov test-compat: back out changeset 591a0afd2ef3 stable
Fri, 08 May 2020 19:22:36 +0800 Anton Shestakov test-compat: back out changeset 4da1d21231ae stable
Fri, 09 Oct 2020 08:39:15 -0700 Martin von Zweigbergk tests: {successorssets} now always return a list, affecting json output stable
Fri, 02 Oct 2020 10:09:14 -0700 Martin von Zweigbergk compat: add implementations of new merge.update() and merge.clean_update() stable
Fri, 02 Oct 2020 09:51:45 -0700 Martin von Zweigbergk compat: rename update() to _update() to make room for a new update() stable
Sun, 25 Oct 2020 21:38:37 +0800 Anton Shestakov tests: use appropriate Python (2 or 3) for json.tool
Sat, 24 Oct 2020 23:55:15 +0800 Anton Shestakov tests: use appropriate Python (2 or 3) for random-revs.py
Sat, 24 Oct 2020 23:47:01 +0800 Anton Shestakov tests: move ad-hoc random_rev.py to testlib/random-revs.py
Sat, 24 Oct 2020 23:26:41 +0800 Anton Shestakov tests: use appropriate Python (2 or 3) for md5sum.py
Mon, 26 Oct 2020 18:32:22 +0100 Pierre-Yves David test-compat: create a new compatibility branch mercurial-5.5 mercurial-5.5
Fri, 25 Sep 2020 09:13:57 -0700 Martin von Zweigbergk compat: add support for upstream rename of merge.update() to _update() stable
Wed, 14 Oct 2020 12:10:05 +0200 Sushil khanchi unstable-list: add an item about author divergence resolution
Wed, 14 Oct 2020 12:09:41 +0200 Sushil khanchi unstable-list: add an item about divergence on changeset description
Wed, 14 Oct 2020 12:09:15 +0200 Sushil khanchi unstable-list: add an item for solving named branch divergence
Tue, 20 Oct 2020 10:33:46 +0200 Pierre-Yves David branching: merge with stable
Mon, 12 Oct 2020 12:33:18 +0200 Sietse Brouwer ngtip: make revset help text slightly more descriptive stable
Wed, 07 Oct 2020 09:34:59 +0200 Sietse Brouwer ngtip: fix TypeError: make revset from revs, not nodes (issue6405) stable
Wed, 14 Oct 2020 15:48:37 +0200 Pierre-Yves David topic: add a `exp….topic.linear-merge` option to allow some oedipus
Thu, 15 Oct 2020 19:46:38 +0200 Pierre-Yves David branching: merge with stable
Sun, 11 Oct 2020 20:50:02 +0800 Anton Shestakov rewind: actually track folds using fold-* metadata in obsmarkers
Mon, 12 Oct 2020 12:09:39 +0200 Sietse Brouwer readme: fix syntax of format-source link stable
Fri, 25 Sep 2020 21:47:30 -0700 Martin von Zweigbergk evolvecmd: move bookmark-deactivation out of _relocatecommit()
Fri, 25 Sep 2020 15:28:17 -0700 Martin von Zweigbergk evolve: deactivate bookmark before updating to destination
Fri, 25 Sep 2020 13:31:41 -0700 Martin von Zweigbergk evolvecmd: inline _evolvemerge() into _relocatecommit()
Fri, 25 Sep 2020 13:12:57 -0700 Martin von Zweigbergk evolvecmd: reorder some functions to match order they're called
Thu, 24 Sep 2020 16:54:13 -0700 Martin von Zweigbergk evolvecmd: rename `r` to usual `stats`
Thu, 24 Sep 2020 16:34:04 -0700 Martin von Zweigbergk evolvecmd: simplify code for moving bookmarks when relocating node
Thu, 24 Sep 2020 16:15:58 -0700 Martin von Zweigbergk evolvecmd: delete bookmark-handling code obsolete since move away from rebase
Thu, 24 Sep 2020 15:33:01 -0700 Martin von Zweigbergk evolvecmd: rename _solveunstable() to _solveorphan()
Wed, 14 Oct 2020 12:08:23 +0200 Sushil khanchi unstable-list: add "merging metadata" section for content-divergence
Sat, 10 Oct 2020 22:44:24 +0530 Sushil khanchi unstable-list: add split and fold in content-divergence resolution
Tue, 22 Sep 2020 13:50:45 +0530 Sushil khanchi unstable-list: add "merging files" section for content-divergence
Tue, 22 Sep 2020 13:50:06 +0530 Sushil khanchi unstable-list: add "finding the resolution parent" section
Tue, 22 Sep 2020 13:49:10 +0530 Sushil khanchi unstable-list: add a "details of resolution" section for content-divergence
Sat, 10 Oct 2020 14:04:11 +0530 Sushil khanchi unstable-list: add new subsections for orphan when parent is pruned
Sat, 10 Oct 2020 14:04:02 +0530 Sushil khanchi unstable-list: some minor updates
Fri, 09 Oct 2020 08:39:15 -0700 Martin von Zweigbergk tests: {successorssets} now always return a list, affecting json output
Thu, 17 Sep 2020 14:11:38 -0400 Matt Harbison discovery: list the new heads like core does when failing a multi-head push
Fri, 21 Aug 2020 18:05:37 +0530 Sushil khanchi evolve: remove trailing white spaces
Fri, 21 Aug 2020 18:04:48 +0530 Sushil khanchi evolve: refactor some error raising logic in content-divergence
Fri, 21 Aug 2020 16:22:24 +0530 Sushil khanchi evolve: update public content divergence acc. to new behavior
Fri, 21 Aug 2020 01:28:33 +0530 Sushil khanchi evolve: move a line a code block above
Fri, 21 Aug 2020 01:27:58 +0530 Sushil khanchi evolve: rename a func and some updates around it
Thu, 20 Aug 2020 23:54:27 +0530 Sushil khanchi evolve: update some comments
Fri, 21 Aug 2020 01:04:08 +0530 Sushil khanchi evolve: no need to return divergent and other
Fri, 21 Aug 2020 00:56:24 +0530 Sushil khanchi evolve: remove an evolvestate which is no more required
Sun, 20 Sep 2020 09:22:04 +0530 Sushil khanchi evolve: remove swapping nodes logic while resolving divergence
Fri, 25 Sep 2020 11:06:46 -0700 Martin von Zweigbergk evolve: don't set evolved node as dirstate p2
Thu, 17 Sep 2020 21:19:13 +0200 Pierre-Yves David changelog: mention `hg rewind --dry-run`
Tue, 22 Sep 2020 13:43:41 +0530 Sushil khanchi evolve: update docstring for mergeusers()
Fri, 02 Oct 2020 10:09:14 -0700 Martin von Zweigbergk compat: add implementations of new merge.update() and merge.clean_update()
Fri, 02 Oct 2020 09:51:45 -0700 Martin von Zweigbergk compat: rename update() to _update() to make room for a new update()
Fri, 25 Sep 2020 09:13:57 -0700 Martin von Zweigbergk compat: add support for upstream rename of merge.update() to _update()
Thu, 17 Sep 2020 23:41:14 -0400 Matt Harbison tests: conditonalize a Windows only output in test-evolve-progress.t stable
less more | rev 5624: (0) -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 tip