| Wed, 02 Jul 2014 00:01:13 -0500 |
Matt Mackall |
merge with stable
|
| Sat, 07 Jun 2014 15:23:12 -0400 |
Augie Fackler |
rebase: fix bug that caused transitive copy records to disappear (issue4192)
stable
|
| Thu, 08 May 2014 16:55:56 -0700 |
Durham Goode |
rebase: specify custom conflict marker labels for rebase (BC)
|
| Sun, 11 May 2014 00:49:35 +0900 |
FUJIWARA Katsunori |
rebase: use "getcommiteditor()" instead of explicit editor choice
|
| Thu, 01 May 2014 16:47:50 +0200 |
Mads Kiilerich |
rebase: empty revset should be a gentle no-op with exit code 1, not an error
stable
|
| Wed, 23 Apr 2014 13:51:35 +0200 |
Julien Cristau |
rebase: don't abort if we're asked to rebase an empty revset
stable
|
| Tue, 26 Nov 2013 03:18:56 +0100 |
Mads Kiilerich |
rebase: tell when reopening a closed branch head
|
| Wed, 19 Mar 2014 02:45:14 +0100 |
Mads Kiilerich |
config: set a 'source' in most cases where config don't come from file but code
|
| Tue, 18 Mar 2014 14:25:28 -0500 |
Matt Mackall |
merge with stable
|
| Wed, 19 Mar 2014 01:07:41 +0900 |
FUJIWARA Katsunori |
rebase: use "commitforceeditor" instead of "ui.edit()" for "--collapse"
stable
|
| Fri, 14 Feb 2014 00:34:20 +0100 |
Simon Heimberg |
rebase: do not raise an UnboundLocalError when called wrong (issue4106)
|
| Thu, 20 Feb 2014 02:39:01 +0100 |
Mads Kiilerich |
rebase: show nice list instead of set repr for 'computed skipped revs' debug
|
| Sat, 15 Feb 2014 01:23:12 +0100 |
Mads Kiilerich |
rebase: fix 'rebase onto %d starting from %s' - show root instead of list repr
|
| Sat, 15 Feb 2014 16:19:19 +0900 |
Yuya Nishihara |
rebase: do not try to reactivate deleted divergent bookmark
stable
|
| Thu, 30 Jan 2014 13:56:56 -0600 |
Matt Mackall |
rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)
stable
|
| Thu, 23 Jan 2014 01:21:08 +0100 |
Simon Heimberg |
hgext: fix one typo in rebase
stable
|
| Sat, 16 Nov 2013 15:46:29 -0500 |
Mads Kiilerich |
rebase: remove old code for handling empty rebaseset
|
| Sun, 17 Nov 2013 18:21:58 -0500 |
Mads Kiilerich |
rebase: improve error message for --base being empty or causing emptiness
|
| Sun, 17 Nov 2013 18:21:58 -0500 |
Mads Kiilerich |
rebase: improve error message for empty --source set
|
| Sat, 16 Nov 2013 15:46:29 -0500 |
Mads Kiilerich |
rebase: improve error message for empty --rev set
|
| Fri, 01 Nov 2013 17:08:06 -0700 |
Durham Goode |
rebase: fix working copy location after a --collapse (issue4080)
stable
|
| Mon, 04 Nov 2013 19:59:00 -0800 |
Durham Goode |
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
stable
|
| Sun, 27 Oct 2013 00:24:25 +0900 |
FUJIWARA Katsunori |
rebase: add description about exit code when there are unresolved conflicts
stable
|
| Wed, 30 Oct 2013 19:45:14 +0100 |
Pierre-Yves David |
rebase: fix selection of base used when rebasing merge (issue4041)
stable
|
| Wed, 23 Oct 2013 23:42:13 +0800 |
Mads Kiilerich |
rebase: improve error message for more than one external parent
stable
|
| Thu, 24 Oct 2013 12:05:22 +0800 |
Mads Kiilerich |
rebase: refactor and rename checkexternal - it is a getter more than a setter
stable
|
| Thu, 24 Oct 2013 01:49:56 +0800 |
Mads Kiilerich |
spelling: random spell checker fixes
stable
|
| Mon, 14 Oct 2013 17:12:59 +0200 |
Pierre-Yves David |
rebase: preserve active bookmark when not at head (issue3813)
|
| Mon, 14 Oct 2013 16:12:29 +0200 |
Pierre-Yves David |
rebase: preserve working directory parent (BC)
|
| Tue, 01 Oct 2013 14:48:53 -0400 |
Augie Fackler |
rebase: preserve metadata from grafts of changes (issue4001)
|
| Tue, 01 Oct 2013 14:28:18 -0400 |
Augie Fackler |
rebase: rework extrafn handling to support multiple extrafns
|
| Tue, 01 Oct 2013 17:00:03 -0700 |
Matt Mackall |
merge with stable
|
| Tue, 01 Oct 2013 00:35:07 +0900 |
FUJIWARA Katsunori |
rebase: catch RepoLookupError at restoring rebase state for summary
stable 2.7.2
|
| Tue, 01 Oct 2013 00:35:07 +0900 |
FUJIWARA Katsunori |
rebase: catch RepoLookupError at restoring rebase state for abort/continue
stable
|
| Fri, 20 Sep 2013 16:32:05 -0700 |
Siddharth Agarwal |
rebase: remove bailifchanged check from pullrebase (BC)
|
| Tue, 03 Sep 2013 15:12:35 -0400 |
Bryan O'Sullivan |
rebase: handle bookmarks matching revset function names (issue3950)
|
| Thu, 01 Aug 2013 17:54:12 -0500 |
Matt Mackall |
rebase: allow aborting when descendants detected
stable
|
| Thu, 01 Aug 2013 17:45:13 -0500 |
Matt Mackall |
rebase: continue abort without strip for immutable csets (issue3997)
stable
|
| Thu, 01 Aug 2013 17:33:09 -0500 |
Matt Mackall |
rebase: don't clobber wd on --abort when we've updated away (issue4009)
stable
|
| Thu, 25 Jul 2013 02:17:52 -0500 |
Matt Mackall |
checkunfinished: accommodate histedit quirk
stable
|
| Wed, 24 Jul 2013 23:51:44 -0500 |
Matt Mackall |
rebase: add checkunfinished support (issue3955)
stable
|
| Wed, 24 Jul 2013 23:51:44 -0500 |
Matt Mackall |
rebase: reorder parent check and state storage
stable
|
| Thu, 11 Jul 2013 19:26:34 -0500 |
Matt Mackall |
rebase: simplify references to branch tips
|
| Tue, 14 May 2013 11:23:17 -0700 |
Bryan O'Sullivan |
summary: indicate if a rebase is underway
|
| Thu, 18 Apr 2013 14:28:06 -0700 |
Siddharth Agarwal |
rebase: check no-op before checking phase (issue3891)
|
| Fri, 08 Feb 2013 16:27:59 -0600 |
Augie Fackler |
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
|
| Tue, 12 Mar 2013 10:43:59 -0700 |
Bryan O'Sullivan |
merge with crew-stable
|
| Mon, 11 Mar 2013 15:37:28 -0700 |
Durham Goode |
rebase: restore active bookmark after rebase --continue
stable
|
| Sun, 10 Feb 2013 18:24:29 +0100 |
Mads Kiilerich |
spelling: fix some minor issues found by spell checker
|
| Sun, 03 Feb 2013 14:26:39 -0800 |
Siddharth Agarwal |
rebase: derive node from target rev (issue3802)
stable
|
| Fri, 01 Feb 2013 02:01:11 +0100 |
Pierre-Yves David |
rebase: mention --rev in the help
stable
|
| Thu, 31 Jan 2013 20:01:26 -0600 |
Kevin Bullock |
rebase: mention phases in the help
stable
|
| Wed, 30 Jan 2013 16:08:32 -0800 |
Siddharth Agarwal |
rebase: delete divergent bookmarks on destination (issue3685)
stable
|
| Wed, 30 Jan 2013 17:49:54 -0800 |
Siddharth Agarwal |
rebase: remove bogus nullmerge check in updatebookmarks
stable
|
| Fri, 18 Jan 2013 23:41:48 +0100 |
Pierre-Yves David |
rebase: properly handle unrebased revision between rebased one
|
| Fri, 18 Jan 2013 23:21:32 +0100 |
Pierre-Yves David |
rebase: lose the comparison to `nullmerge`
|
| Fri, 18 Jan 2013 14:15:32 +0100 |
Pierre-Yves David |
rebase: do not invent successor to skipped changeset
|
| Thu, 17 Jan 2013 00:35:01 +0100 |
Pierre-Yves David |
rebase: support multiple roots for rebaseset
|
| Tue, 15 Jan 2013 23:30:10 +0100 |
Mads Kiilerich |
refactoring: use unlinkpath with ignoremissing
|
| Tue, 04 Dec 2012 14:58:19 +0100 |
Pierre-Yves David |
clfilter: drop unnecessary explicit filtering on rebase
|
