| 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
|
| Sat, 19 Sep 2020 17:56:01 +0200 |
Pierre-Yves David |
ci: drop extraneous space
|
| Thu, 20 Aug 2020 17:32:22 +0530 |
Sushil khanchi |
evolve: resolutionparent should be succs of otherp1
|
| Thu, 13 Aug 2020 18:10:51 +0530 |
Sushil khanchi |
evolve: handle preparation logic for public divergence in one block
|
| Thu, 13 Aug 2020 17:22:19 +0530 |
Sushil khanchi |
evolve: add logic to decide local and other side before merge
|
| Wed, 05 Aug 2020 14:25:29 +0530 |
Sushil khanchi |
evolve: add some initial values in evolvestate
|
| Wed, 05 Aug 2020 14:19:29 +0530 |
Sushil khanchi |
evolve: move initial evolvestate values to main function
|
