| Thu, 26 Dec 2019 20:28:21 +0100 |
Pierre-Yves David |
evolve: further simplify a conditional
|
file |
diff |
annotate
|
| Thu, 26 Dec 2019 20:23:27 +0100 |
Pierre-Yves David |
evolve: simplify some conditional
|
file |
diff |
annotate
|
| Thu, 26 Dec 2019 20:17:01 +0100 |
Pierre-Yves David |
evolve: rename some variable ahead of time
|
file |
diff |
annotate
|
| Thu, 28 Nov 2019 19:01:28 +0530 |
Sushil khanchi |
evolve: add logic to cover --stop when "divergent" relocation in play
|
file |
diff |
annotate
|
| Thu, 19 Dec 2019 21:36:59 -0800 |
Martin von Zweigbergk |
evolvecmd: fix a typo node->None
|
file |
diff |
annotate
|
| Thu, 19 Dec 2019 21:15:31 -0800 |
Martin von Zweigbergk |
evolvecmd: avoid a ctx->node->ctx conversion
|
file |
diff |
annotate
|
| Thu, 19 Dec 2019 13:06:29 -0800 |
Martin von Zweigbergk |
evolvecmd: mark relocate() private
|
file |
diff |
annotate
|
| Thu, 19 Dec 2019 22:31:13 -0800 |
Martin von Zweigbergk |
cleanup: replace .parents()[0] by .p1()
|
file |
diff |
annotate
|
| Wed, 27 Nov 2019 19:50:33 +0530 |
Sushil khanchi |
evolve: use meaningful variable names for a return value
|
file |
diff |
annotate
|
| Wed, 27 Nov 2019 12:34:19 +0530 |
Sushil khanchi |
evolve: add logic to cover --continue case when relocating "divergent"
|
file |
diff |
annotate
|
| Mon, 25 Nov 2019 19:12:51 +0530 |
Sushil khanchi |
evolve: use more specific key name to store in evolvestate
|
file |
diff |
annotate
|
| Thu, 12 Dec 2019 17:22:18 +0530 |
Sushil khanchi |
evolve: remove the unnecessary condition to check empty successors set
|
file |
diff |
annotate
|
| Tue, 19 Nov 2019 14:54:13 -0800 |
Martin von Zweigbergk |
evolve: delete redundant and incorrect code for updating dirstate
|
file |
diff |
annotate
|
| Mon, 09 Dec 2019 10:33:48 -0800 |
Martin von Zweigbergk |
evolve: use ui.configoverride() instead of ui.backupconfig()
|
file |
diff |
annotate
|
| Mon, 09 Dec 2019 10:43:04 -0800 |
Martin von Zweigbergk |
evolve: remove obsolete backup of allowemptycommit config
|
file |
diff |
annotate
|
| Mon, 09 Dec 2019 10:44:42 -0800 |
Martin von Zweigbergk |
evolve: remove dead initilization of "newnode" variable
|
file |
diff |
annotate
|
| Thu, 12 Dec 2019 17:16:02 +0530 |
Sushil khanchi |
evolve: fix a typo
|
file |
diff |
annotate
|
| Tue, 10 Dec 2019 20:47:13 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Fri, 11 Oct 2019 21:32:27 +0200 |
Manuel Jacob |
evolve: preserve date when resolving content-divergence (issue6202)
stable
|
file |
diff |
annotate
|
| Fri, 06 Dec 2019 23:43:00 +0530 |
Sushil khanchi |
evolve: abort if deciding resolution parent is ambiguous
stable
|
file |
diff |
annotate
|
| Sat, 23 Nov 2019 16:17:04 +0530 |
Sushil khanchi |
evolve: make sure divergence resolution doesn't undo changes (issue6203)
stable
|
file |
diff |
annotate
|
| Fri, 06 Dec 2019 14:01:29 +0100 |
Manuel Jacob |
evolve: fix content-divergence resolution when p1 is null (issue6201)
stable
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 02:30:12 -0400 |
Rodrigo Damazio |
help: categorizing evolve and topic commands
|
file |
diff |
annotate
|
| Fri, 27 Sep 2019 06:55:05 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Mon, 09 Sep 2019 09:28:47 +0700 |
Anton Shestakov |
evolve: check that relocating makes sense in _solvedivergent() (issue5958)
stable
|
file |
diff |
annotate
|
| Mon, 16 Sep 2019 12:44:38 -0700 |
Kyle Lippincott |
cmdstate: introduce a "saver" contextmanager and use it in place of save()
|
file |
diff |
annotate
|
| Tue, 03 Sep 2019 12:48:47 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Tue, 03 Sep 2019 13:02:20 +0700 |
Anton Shestakov |
evolve: test that target is not orig in _solveunstable() (issue6097)
stable
|
file |
diff |
annotate
|
| Tue, 06 Aug 2019 15:06:38 +0200 |
Raphaël Gomès |
python3: use format-source to run byteify-strings in .py files
|
file |
diff |
annotate
|
| Tue, 06 Aug 2019 15:06:27 +0200 |
Raphaël Gomès |
python3: enforce byte prefix for vfs.open()
|
file |
diff |
annotate
|
| Tue, 06 Aug 2019 11:32:01 +0200 |
Raphaël Gomès |
python3: add raw prefix to open()-like functions
|
file |
diff |
annotate
|
| Tue, 06 Aug 2019 11:29:35 +0200 |
Raphaël Gomès |
python3: add raw prefix to "troubles"-related dicts
|
file |
diff |
annotate
|
| Tue, 06 Aug 2019 11:26:29 +0200 |
Raphaël Gomès |
python3: add raw prefix in cases harder to analyze at the token level
|
file |
diff |
annotate
|
| Tue, 06 Aug 2019 11:07:16 +0200 |
Raphaël Gomès |
python3: prefix all regex to work with python 2 and 3
|
file |
diff |
annotate
|
| Thu, 11 Jul 2019 22:56:46 +0530 |
Taapas Agrawal |
abort: added support for evolve to hg abort
|
file |
diff |
annotate
|
| Fri, 12 Jul 2019 23:43:25 +0530 |
Taapas Agrawal |
evolve: fixed lock acquire before checking state
|
file |
diff |
annotate
|
| Mon, 29 Jul 2019 13:54:57 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
file |
diff |
annotate
|
| Wed, 17 Jul 2019 12:47:37 -0700 |
Martin von Zweigbergk |
py3: redefine "troublecategories" in evolve as a dict
|
file |
diff |
annotate
|
| Wed, 17 Jul 2019 11:03:09 -0700 |
Martin von Zweigbergk |
py3: convert opts keys to bytes before passing to core APIs
|
file |
diff |
annotate
|
| Fri, 14 Jun 2019 18:44:43 -0700 |
kevpeng |
evolve: further clarify when update is performed
stable
|
file |
diff |
annotate
|
| Thu, 11 Jul 2019 14:46:17 -0700 |
Martin von Zweigbergk |
py3: replace str(ctx) by bytes(ctx)
|
file |
diff |
annotate
|
| Thu, 11 Jul 2019 14:21:23 -0700 |
Martin von Zweigbergk |
py3: replace iter.next() by next(iter)
|
file |
diff |
annotate
|
| Wed, 17 Jul 2019 18:06:14 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Wed, 03 Jul 2019 11:13:47 -0700 |
Martin von Zweigbergk |
py3: switch from iteritems() to items()
|
file |
diff |
annotate
|
| Thu, 04 Jul 2019 17:32:58 +0200 |
kevpeng |
evolve: further clarify that update is performed only when requested
stable
|
file |
diff |
annotate
|
| Thu, 04 Jul 2019 16:55:57 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Sun, 16 Jun 2019 23:39:55 +0530 |
Sushil khanchi |
evolve: fix the code flow pattern of solving obswdir par and troubled revs
|
file |
diff |
annotate
|
| Sun, 09 Jun 2019 12:07:08 +0530 |
Sushil khanchi |
evolve: refactor for consistent behavior of evolve when wdp is obsolete
|
file |
diff |
annotate
|
| Sat, 15 Jun 2019 17:17:19 +0530 |
Sushil khanchi |
evolve: backout 3027005c42c3 to reintroduce a bug for right fix
|
file |
diff |
annotate
|
| Tue, 18 Jun 2019 17:17:31 +0800 |
Anton Shestakov |
evolve: orphans that evolve into nothing don't need successors (issue5967)
stable
|
file |
diff |
annotate
|
| Sat, 08 Jun 2019 16:03:05 +0530 |
Sushil khanchi |
evolve: clarify why returning by adding inline doc
|
file |
diff |
annotate
|
| Sat, 08 Jun 2019 15:59:31 +0530 |
Sushil khanchi |
evolve: move a code block to have right value in has_some_val
|
file |
diff |
annotate
|
| Sat, 08 Jun 2019 16:09:37 +0800 |
Anton Shestakov |
evolve: correct action verb in a message
|
file |
diff |
annotate
|
| Sat, 08 Jun 2019 16:06:24 +0800 |
Anton Shestakov |
evolve: internationalize a message
|
file |
diff |
annotate
|
| Thu, 06 Jun 2019 17:37:42 +0800 |
Anton Shestakov |
evolvecmd: the proper way to deal with conflicts is to resolve them
|
file |
diff |
annotate
|
| Mon, 29 Apr 2019 23:43:16 +0530 |
Sushil khanchi |
evolve: mention that --all is default, in list of options
|
file |
diff |
annotate
|
| Sun, 05 May 2019 18:24:59 +0530 |
Sushil khanchi |
evolve: consider using three way merge to get the user for div resolution
|
file |
diff |
annotate
|
| Fri, 26 Apr 2019 01:20:08 +0530 |
Sushil khanchi |
evolve: move status msg to verbose mode in content-divergence resolution
|
file |
diff |
annotate
|
| Sat, 27 Apr 2019 22:59:48 -0400 |
Matt Harbison |
revset: switch internal uses and tests to `predecessors` from legacy name
|
file |
diff |
annotate
|
| Sat, 27 Apr 2019 22:24:30 -0400 |
Matt Harbison |
revset: add `unstable` alias for `troubled`
|
file |
diff |
annotate
|