| Tue, 25 Dec 2018 14:35:54 +0530 |
Sushil khanchi |
evolve: cover the orphanmerge part missed by lastsolved
|
file |
diff |
annotate
|
| Mon, 14 Jan 2019 09:14:38 -0800 |
Martin von Zweigbergk |
evolve: adapt for deprecated ui.progress()
|
file |
diff |
annotate
|
| Mon, 24 Dec 2018 18:38:25 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Fri, 21 Dec 2018 13:14:59 +0800 |
Pierre-Yves David |
evolve: detect unresolved conflict during evolve --continue (issue5966)
stable
|
file |
diff |
annotate
|
| Thu, 13 Dec 2018 18:57:49 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Thu, 13 Dec 2018 17:41:06 +0100 |
James Reynolds |
issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
stable
|
file |
diff |
annotate
|
| Tue, 27 Nov 2018 03:56:27 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Tue, 27 Nov 2018 03:46:06 +0100 |
Sushil khanchi |
evolve: update the abort to a ProgrammingError
stable
|
file |
diff |
annotate
|
| Tue, 20 Nov 2018 11:33:38 -0500 |
Eric Spishak-Thomas |
evolve: fix a documentation typo
stable
|
file |
diff |
annotate
|
| Mon, 19 Nov 2018 01:45:34 +0000 |
Pierre-Yves David |
compat: drop 4.3 compatiblity code for `obsutil.allprecursors` function
|
file |
diff |
annotate
|
| Mon, 19 Nov 2018 01:44:28 +0000 |
Pierre-Yves David |
compat: drop 4.3 compatiblity code for `ui.edit` method
|
file |
diff |
annotate
|
| Wed, 31 Oct 2018 14:06:17 +0530 |
Sushil khanchi |
evolve: modify and move the comment to appropriate position
|
file |
diff |
annotate
|
| Sat, 10 Nov 2018 17:54:28 +0100 |
Pierre-Yves David |
style: silence another flak8 warning
|
file |
diff |
annotate
|
| Sat, 10 Nov 2018 15:47:46 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Sat, 10 Nov 2018 15:37:22 +0100 |
Pierre-Yves David |
style: fix various flake8 warning
stable
|
file |
diff |
annotate
|
| Sat, 10 Nov 2018 00:55:34 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Tue, 06 Nov 2018 10:43:35 +0530 |
Sushil khanchi |
evolvecmd: _possibledestination() skip visiting empty parent
stable
|
file |
diff |
annotate
|
| Fri, 26 Oct 2018 12:54:40 +0530 |
Sushil khanchi |
evolve: use stack template in --continue case also
|
file |
diff |
annotate
|
| Thu, 25 Oct 2018 18:51:55 +0200 |
Pierre-Yves David |
branching; merge with stable
|
file |
diff |
annotate
|
| Thu, 25 Oct 2018 18:08:34 +0200 |
Pierre-Yves David |
evolve: check if we should use stack template for each item in the stack
stable
|
file |
diff |
annotate
|
| Thu, 25 Oct 2018 12:49:48 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
file |
diff |
annotate
|
| Thu, 18 Oct 2018 22:11:43 -0700 |
Martin von Zweigbergk |
evolve: adapt for changed @command decorator
stable
|
file |
diff |
annotate
|
| Thu, 18 Oct 2018 22:11:43 -0700 |
Martin von Zweigbergk |
evolve: adapt for changed @command decorator
|
file |
diff |
annotate
|
| Wed, 17 Oct 2018 23:10:30 +0800 |
Anton Shestakov |
commands: adjust metavariables as appropriate
|
file |
diff |
annotate
|
| Sun, 14 Oct 2018 13:37:11 +0200 |
Anton Shestakov |
evolvecmd: use modern vocabulary in help text for evolve
stable
|
file |
diff |
annotate
|
| Sun, 14 Oct 2018 13:35:13 +0200 |
Anton Shestakov |
evolvecmd: mark flags with old instability names as deprecated
stable
|
file |
diff |
annotate
|
| Tue, 02 Oct 2018 12:55:29 +0530 |
Sushil khanchi |
evolve: use stack alias s# in `hg evolve` msgs
|
file |
diff |
annotate
|
| Mon, 01 Oct 2018 19:59:17 +0530 |
Sushil khanchi |
evolve: extract displayer to _solveone()
|
file |
diff |
annotate
|
| Mon, 01 Oct 2018 13:20:30 +0530 |
Sushil khanchi |
utility: add a template alias that will be used in evolve msgs
|
file |
diff |
annotate
|
| Fri, 21 Sep 2018 15:52:53 +0530 |
Sushil khanchi |
evovle: remove redundancy in evolve output
|
file |
diff |
annotate
|
| Thu, 06 Sep 2018 16:14:24 -0700 |
Martin von Zweigbergk |
evolve: fix use of "'%d' % ctx"
stable
|
file |
diff |
annotate
|
| Fri, 31 Aug 2018 14:26:37 +0200 |
Boris Feld |
pick: fix last references of grab in code
|
file |
diff |
annotate
|
| Mon, 20 Aug 2018 12:21:39 +0300 |
Pulkit Goyal |
evolve: delete evolvestate after aborting interrupted `next --evolve`
stable
|
file |
diff |
annotate
|
| Sat, 18 Aug 2018 21:03:45 +0530 |
Pulkit Goyal |
evolve: set the second parent if we get conflicts while evolving
stable
|
file |
diff |
annotate
|
| Sat, 18 Aug 2018 21:01:14 +0530 |
Pulkit Goyal |
evolvecmd: import mercurial.node module as nodemod
stable
|
file |
diff |
annotate
|
| Thu, 02 Aug 2018 04:11:54 +0200 |
Pierre-Yves David |
compat: make compatible call to ui.edit for hg <= 4.3
stable
|
file |
diff |
annotate
|
| Thu, 07 Jun 2018 18:18:30 +0530 |
Pulkit Goyal |
evolve: continue conflicted relocation content-divergence
|
file |
diff |
annotate
|
| Sun, 08 Jul 2018 22:16:17 +0530 |
Pulkit Goyal |
evolvecmd: introduce fn to be wrapped by extensions resolving content-div
|
file |
diff |
annotate
|
| Sun, 08 Jul 2018 21:18:33 +0530 |
Pulkit Goyal |
evolvecmd: move remaining logic to merge commit desc to existing utility fn
|
file |
diff |
annotate
|
| Tue, 19 Jun 2018 23:21:54 +0530 |
Pulkit Goyal |
evolve: move the bookmarks also when updating to successor (issue5923)
|
file |
diff |
annotate
|
| Fri, 15 Jun 2018 00:50:17 +0530 |
Pulkit Goyal |
evolve: make one missed error to align other error messages
|
file |
diff |
annotate
|
| Fri, 15 Jun 2018 00:16:29 +0530 |
Pulkit Goyal |
evolve: raise error.InterventionRequired instead of Abort when conflicts
|
file |
diff |
annotate
|
| Thu, 14 Jun 2018 01:39:33 +0530 |
Pulkit Goyal |
evolve: create resolved cset on successors of current parents
|
file |
diff |
annotate
|
| Thu, 14 Jun 2018 01:06:12 +0530 |
Pulkit Goyal |
evolve: introduce a resolutionparent variable and store it in evolvestate
|
file |
diff |
annotate
|
| Wed, 13 Jun 2018 18:08:57 +0530 |
Pulkit Goyal |
evolve: introduce a dirstatedance() fn to fix dirstate after parent change
|
file |
diff |
annotate
|
| Wed, 13 Jun 2018 17:15:10 +0530 |
Pulkit Goyal |
evolve: create a new commit instead of amending one of the divergents
|
file |
diff |
annotate
|
| Tue, 12 Jun 2018 23:20:54 +0530 |
Pulkit Goyal |
evolve: always order the revs to be evolved
|
file |
diff |
annotate
|
| Tue, 12 Jun 2018 19:00:12 +0530 |
Pulkit Goyal |
evolve: improve error messages when conflicts occur
|
file |
diff |
annotate
|
| Tue, 12 Jun 2018 04:01:19 +0530 |
Pulkit Goyal |
evolve: point to `hg help evolve.interrupted` while resolving content-div
|
file |
diff |
annotate
|
| Mon, 11 Jun 2018 20:17:56 +0530 |
Pulkit Goyal |
evolve: strip the extra obsmarkers if any on `hg evolve --abort`
|
file |
diff |
annotate
|
| Mon, 11 Jun 2018 20:13:36 +0530 |
Pulkit Goyal |
evolve: store the obsmarkers to be deleted in evolvestate
|
file |
diff |
annotate
|
| Mon, 11 Jun 2018 15:52:11 +0530 |
Pulkit Goyal |
evolve: store obsmarkers to be deleted in evolvestate
|
file |
diff |
annotate
|
| Mon, 11 Jun 2018 15:38:43 +0530 |
Pulkit Goyal |
evolve: factor out logic to merge branches in separate function
|
file |
diff |
annotate
|
| Mon, 11 Jun 2018 00:47:28 +0530 |
Pulkit Goyal |
evolve: strip the relocation commit on `hg evolve --stop`
|
file |
diff |
annotate
|
| Mon, 11 Jun 2018 00:43:39 +0530 |
Pulkit Goyal |
evolve: declare updated and pctx variables in stopevolve()
|
file |
diff |
annotate
|
| Sun, 10 Jun 2018 22:52:11 +0530 |
Pulkit Goyal |
evolve: store the old other divergent node after relocation in evolvestate
|
file |
diff |
annotate
|
| Sun, 10 Jun 2018 22:42:57 +0530 |
Pulkit Goyal |
evolve: factor out logic for --stop flag in separate function
|
file |
diff |
annotate
|
| Sun, 10 Jun 2018 20:35:48 +0530 |
Pulkit Goyal |
evolve: move logic to continue interrupted content-div resolution to new fn
|
file |
diff |
annotate
|
| Mon, 11 Jun 2018 01:12:12 +0530 |
Pulkit Goyal |
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
|
file |
diff |
annotate
|
| Thu, 07 Jun 2018 22:59:39 +0530 |
Pulkit Goyal |
evolve: store the evolvestate if relocation results in conflicts
|
file |
diff |
annotate
|