| Fri, 18 Sep 2020 10:15:13 -0700 |
Martin von Zweigbergk |
rebase: delete unused p1 argument to _concludenode()
|
| Fri, 18 Sep 2020 10:04:02 -0700 |
Martin von Zweigbergk |
rebase: fix an inconsistent hyphenation in a debug message
|
| Tue, 28 Jul 2020 20:47:50 +0200 |
Manuel Jacob |
rebase: fix regression in file change detection introduced by 0ecb3b11fcad
stable
|
| Tue, 14 Jul 2020 13:35:54 -0700 |
Daniel Ploch |
error: normalize "unresolved conflicts" error messages with a custom class
|
| Mon, 13 Jul 2020 16:42:44 -0700 |
Daniel Ploch |
error: unify the error message formats for 'rebase' and 'unshelve'
|
| Mon, 01 Jun 2020 08:38:42 +0200 |
Manuel Jacob |
rebase: consider rewrite.empty-successor configuration
|
| Sat, 11 Jul 2020 03:10:23 +0200 |
Manuel Jacob |
rebase: correctly check for empty commit in in-memory mode
|
| Sat, 11 Jul 2020 00:53:34 +0200 |
Manuel Jacob |
overlayworkingctx: rename misleadingly named `isempty()` method
|
| Thu, 09 Jul 2020 07:00:32 +0200 |
Manuel Jacob |
rebase: remove now unnecessary logic to allow empty commit when branch changes
|
| Mon, 15 Jun 2020 12:00:15 -0400 |
Augie Fackler |
merge with stable
|
| Thu, 30 Apr 2020 00:33:00 -0400 |
Matt Harbison |
rebase: avoid clobbering wdir() with --dry-run or --confirm (issue6291)
stable
|
| Mon, 18 May 2020 14:59:59 -0400 |
Augie Fackler |
mergestate: split out merge state handling code from main merge module
|
| Wed, 01 Apr 2020 14:34:21 -0700 |
Martin von Zweigbergk |
rebase: don't create merge when continuing rebase interrupted by old hg
|
| Fri, 13 Mar 2020 16:57:38 -0700 |
Martin von Zweigbergk |
rebase: accept multiple --base arguments (BC)
|
| Fri, 13 Mar 2020 16:39:32 -0700 |
Martin von Zweigbergk |
rebase: accept multiple --source arguments (BC)
|
| Fri, 13 Mar 2020 19:29:02 -0700 |
Martin von Zweigbergk |
rebase: mention -r argument in synopsis
|
| Fri, 13 Mar 2020 16:36:31 -0700 |
Martin von Zweigbergk |
rebase: remove unused defaults argument values from _definedestmap()
|
| Fri, 06 Mar 2020 13:27:41 -0500 |
Augie Fackler |
cleanup: run pyupgrade on our source tree to clean up varying things
|
| Fri, 28 Feb 2020 11:32:27 -0800 |
Martin von Zweigbergk |
cleanup: remove redundant clearing of mergestate in rebase and shelve
|
| Fri, 10 Jan 2020 17:20:12 -0800 |
Martin von Zweigbergk |
rebase: remove some now-unused parent arguments
|
| Fri, 10 Jan 2020 21:40:01 -0800 |
Martin von Zweigbergk |
rebase: remove some redundant setting of dirstate parents
|
| Fri, 10 Jan 2020 14:22:20 -0800 |
Martin von Zweigbergk |
rebase: don't use rebased node as dirstate p2 (BC)
|
| Fri, 10 Jan 2020 14:17:56 -0800 |
Martin von Zweigbergk |
rebase: stop relying on having two parents to resume rebase
|
| Thu, 16 Jan 2020 00:03:19 -0800 |
Martin von Zweigbergk |
rebase: always be graft-like, not merge-like, also for merges
|
| Wed, 15 Jan 2020 15:30:25 -0800 |
Martin von Zweigbergk |
merge: introduce a clean_update() for that use-case
|
| Fri, 31 Jan 2020 10:53:50 -0800 |
Martin von Zweigbergk |
rebase: abort if the user tries to rebase the working copy
|
| Wed, 15 Jan 2020 22:24:16 -0800 |
Martin von Zweigbergk |
rebase: define base in only place in defineparents()
|
| Mon, 27 Jan 2020 09:14:19 -0800 |
Martin von Zweigbergk |
cmdutil: change check_incompatible_arguments() *arg to single iterable
|
| Wed, 15 Jan 2020 17:15:45 -0800 |
Martin von Zweigbergk |
rebase: move some variables after an error cases where they're not needed
|
| Wed, 15 Jan 2020 10:44:23 -0800 |
Martin von Zweigbergk |
rebase: clarify a little by calculating a set in Python instead of in revset
|
