| Mon, 08 Feb 2016 19:32:29 +0100 |
Pierre-Yves David |
destutil: allow to specify an explicit source for the merge
|
file |
diff |
annotate
|
| Mon, 08 Feb 2016 18:12:06 +0100 |
Pierre-Yves David |
destutil: remove current head from list of candidates early
|
file |
diff |
annotate
|
| Mon, 08 Feb 2016 17:53:44 +0100 |
Pierre-Yves David |
destutil: add an 'action' layer to the destmerge message dictionary
|
file |
diff |
annotate
|
| Mon, 08 Feb 2016 17:34:32 +0100 |
Pierre-Yves David |
destutil: document various failure cases
|
file |
diff |
annotate
|
| Mon, 08 Feb 2016 14:56:28 +0100 |
Pierre-Yves David |
destutil: consistently retrieve 'p1' and 'branch'
|
file |
diff |
annotate
|
| Mon, 08 Feb 2016 14:55:58 +0100 |
Pierre-Yves David |
merge: give priority to "not at head" failures for bare 'hg merge'
|
file |
diff |
annotate
|
| Tue, 09 Feb 2016 21:14:37 +0000 |
Pierre-Yves David |
destutil: extract all 'mergedest' abort messages into a dictionary
|
file |
diff |
annotate
|
| Tue, 02 Feb 2016 15:24:11 +0000 |
Pierre-Yves David |
update: change default destination to tipmost descendant (issue4673) (BC)
|
file |
diff |
annotate
|
| Tue, 02 Feb 2016 14:49:02 +0000 |
Pierre-Yves David |
update: warn about other topological heads on bare update
|
file |
diff |
annotate
|
| Thu, 24 Dec 2015 10:16:30 -0800 |
Gregory Szorc |
destutil: use scmutil.revrange for desthistedit (issue5001)
|
file |
diff |
annotate
|
| Sat, 12 Dec 2015 13:32:25 -0500 |
Gregory Szorc |
destutil: use absolute_import
|
file |
diff |
annotate
|
| Sat, 24 Oct 2015 19:56:39 +0100 |
Gregory Szorc |
histedit: pick an appropriate base changeset by default (BC)
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 03:15:54 +0100 |
Pierre-Yves David |
destmerge: extract logic based on branch heads in its own function
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 03:13:14 +0100 |
Pierre-Yves David |
destmerge: extract logic based on bookmark into its own function
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 03:00:09 +0100 |
Pierre-Yves David |
destupdate: have a generic and extensible way to run each step
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 02:33:09 +0100 |
Pierre-Yves David |
destupdate: extract logic based on branch in its own function
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 02:27:30 +0100 |
Pierre-Yves David |
destupdate: extract logic based on bookmarks in its own function
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 02:15:43 +0100 |
Pierre-Yves David |
destupdate: extract logic based on obsolescence marker in its own function
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 02:12:55 +0100 |
Pierre-Yves David |
destupdate: move obsolete handling first
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 02:12:15 +0100 |
Pierre-Yves David |
destupdate: indent bookmark and branch logic
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 14:10:57 +0100 |
Pierre-Yves David |
destupdate: extract validation logic
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:11:00 +0100 |
Pierre-Yves David |
destutil: move default merge destination into a function
|
file |
diff |
annotate
|
| Mon, 05 Oct 2015 04:26:26 -0700 |
Pierre-Yves David |
update: introduce a 'UpdateAbort' exception
|
file |
diff |
annotate
|
| Tue, 29 Sep 2015 01:03:26 -0700 |
Pierre-Yves David |
destupdate: also include bookmark related logic
|
file |
diff |
annotate
|
| Tue, 29 Sep 2015 00:18:49 -0700 |
Pierre-Yves David |
destupdate: include the 'check' logic
|
file |
diff |
annotate
|
| Mon, 05 Oct 2015 03:50:47 -0700 |
Pierre-Yves David |
destupdate: move the check related to the "clean" logic in the function
|
file |
diff |
annotate
|
| Thu, 08 Oct 2015 12:55:45 -0700 |
Pierre-Yves David |
error: get Abort from 'error' instead of 'util'
|
file |
diff |
annotate
|
| Mon, 05 Oct 2015 01:46:47 -0700 |
Pierre-Yves David |
update: move default destination computation to a function
|
file |
diff |
annotate
|