| Sat, 27 Feb 2016 18:02:12 +0100 |
Pierre-Yves David |
rebase: remove experimental option from 'rebase' config section
|
file |
diff |
annotate
|
| Sun, 14 Feb 2016 13:25:59 +0000 |
Pierre-Yves David |
rebase: choose default destination the same way as 'hg merge' (BC)
|
file |
diff |
annotate
|
| Wed, 17 Feb 2016 20:31:34 +0000 |
Kostia Balytskyi |
rebase: add potential divergent commit hashes to error message (issue5086)
|
file |
diff |
annotate
|
| Wed, 17 Feb 2016 22:45:01 +0100 |
liscju |
rebase: adds storing collapse message (issue4792)
|
file |
diff |
annotate
|
| Tue, 09 Feb 2016 23:49:55 +0000 |
Pierre-Yves David |
rebase: extract rebaseset and destination computation in a function
|
file |
diff |
annotate
|
| Thu, 04 Feb 2016 03:46:38 +0000 |
timeless |
rebase: suggest the correct tool to continue (not rebase)
|
file |
diff |
annotate
|
| Sun, 14 Feb 2016 00:45:17 +0000 |
Pierre-Yves David |
rebase: perform update through the 'update' command
|
file |
diff |
annotate
|
| Sat, 13 Feb 2016 16:59:32 +0000 |
Pierre-Yves David |
rebase: 'hg pull --rebase' now update only if there was nothing to rebase
|
file |
diff |
annotate
|
| Sun, 07 Feb 2016 00:49:31 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Fri, 05 Feb 2016 01:56:46 +0000 |
timeless |
rebase: update working directory when aborting (issue5084)
stable
|
file |
diff |
annotate
|
| Thu, 04 Feb 2016 23:29:32 +0000 |
timeless |
rebase: document that tool does not apply to deleted files
|
file |
diff |
annotate
|
| Thu, 04 Feb 2016 22:14:53 +0000 |
timeless |
rebase: mention help merge-tools in help
|
file |
diff |
annotate
|
| Wed, 03 Feb 2016 09:23:31 -0800 |
Siddharth Agarwal |
rebase: don't preserve most extra fields
stable 3.7.1
|
file |
diff |
annotate
|
| Wed, 03 Feb 2016 09:24:47 -0800 |
Siddharth Agarwal |
rebase: backout changeset d755a9531fce
stable
|
file |
diff |
annotate
|
| Wed, 03 Feb 2016 09:23:52 -0800 |
Siddharth Agarwal |
rebase: backout changeset 986d04b9fedd
stable
|
file |
diff |
annotate
|
| Mon, 01 Feb 2016 15:41:43 +0000 |
Martijn Pieters |
rebase: better way to detect non-detaching revisions (issue5044)
stable
|
file |
diff |
annotate
|
| Mon, 01 Feb 2016 22:14:06 +0900 |
FUJIWARA Katsunori |
doc: use correct indentation for enumeration
stable
|
file |
diff |
annotate
|
| Mon, 01 Feb 2016 22:06:35 +0900 |
FUJIWARA Katsunori |
doc: prevent non-literal text block from being treated as literal one
stable
|
file |
diff |
annotate
|
| Fri, 22 Jan 2016 20:32:47 +0000 |
timeless |
rebase: restore help for rebase w/o args (issue5059)
stable
|
file |
diff |
annotate
|
| Fri, 15 Jan 2016 13:14:48 -0800 |
Bryan O'Sullivan |
with: use context manager for transaction in rebase
|
file |
diff |
annotate
|
| Thu, 14 Jan 2016 11:50:28 -0800 |
Laurent Charignon |
rebase: small refactoring to allow better extensibility from extensions
|
file |
diff |
annotate
|
| Tue, 12 Jan 2016 13:43:41 -0800 |
Laurent Charignon |
rebase: prevent creating divergence
|
file |
diff |
annotate
|
| Wed, 06 Jan 2016 12:55:56 -0800 |
Laurent Charignon |
rebase: create a new variable to make the next patch more legible
|
file |
diff |
annotate
|
| Wed, 06 Jan 2016 12:55:56 -0800 |
Laurent Charignon |
rebase: minor refactoring of _computeobsoletenotrebased
|
file |
diff |
annotate
|
| Thu, 24 Dec 2015 20:41:40 +0000 |
timeless |
rebase: hook afterresolvedstates
|
file |
diff |
annotate
|
| Tue, 29 Dec 2015 23:58:30 +0900 |
FUJIWARA Katsunori |
revset: use delayregistrar to register predicate in extension easily
|
file |
diff |
annotate
|
| Tue, 29 Dec 2015 15:32:12 -0800 |
Laurent Charignon |
rebase: better error message when rebased changes are all in destination
|
file |
diff |
annotate
|
| Fri, 18 Dec 2015 18:32:15 +0000 |
timeless |
rebase: mention conflict in documentation instead of merge
|
file |
diff |
annotate
|
| Fri, 18 Dec 2015 18:31:45 +0000 |
timeless |
rebase: simplify documentation about heads
|
file |
diff |
annotate
|
| Fri, 18 Dec 2015 18:22:03 +0000 |
timeless |
rebase: simplify documentation about --keep
|
file |
diff |
annotate
|
| Fri, 18 Dec 2015 18:24:41 +0000 |
timeless |
rebase: simplify documentation about selecting commits to rebase
|
file |
diff |
annotate
|
| Fri, 18 Dec 2015 18:06:43 +0000 |
timeless |
rebase: simplify documentation about public commits
|
file |
diff |
annotate
|
| Mon, 14 Dec 2015 18:54:03 -0500 |
Augie Fackler |
merge: have merge.update use a matcher instead of partial fn
|
file |
diff |
annotate
|
| Sat, 05 Dec 2015 23:50:13 +0900 |
Yuya Nishihara |
rebase: remove extra "if" from check of collapsing named branches
|
file |
diff |
annotate
|
| Sat, 05 Dec 2015 23:48:22 +0900 |
Yuya Nishihara |
rebase: drop redundant functions to keep branch and graft source explicitly
|
file |
diff |
annotate
|
| Thu, 03 Dec 2015 08:31:20 -0800 |
Laurent Charignon |
rebase: only clear rebase status after the rebase transaction has completed
|
file |
diff |
annotate
|
| Wed, 11 Nov 2015 20:07:15 -0500 |
Augie Fackler |
commands: inline definition of localrepo.parents() and drop the method (API)
|
file |
diff |
annotate
|
| Sat, 28 Nov 2015 04:11:14 -0500 |
Mike Edgar |
rebase: propagate extra dict from rebase source changeset
|
file |
diff |
annotate
|
| Fri, 20 Nov 2015 14:06:31 -0800 |
Laurent Charignon |
rebase: use bookmarks.recordchange instead of bookmarks.write
|
file |
diff |
annotate
|
| Fri, 20 Nov 2015 11:36:05 -0800 |
Laurent Charignon |
rebase: indentation change to make the next patch more legible
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 15:58:06 -0800 |
Laurent Charignon |
rebase: refactoring to avoid repetition of expression
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 16:06:00 -0800 |
Laurent Charignon |
rebase: remove an unused todo
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 13:44:29 -0800 |
Laurent Charignon |
rebase: don't rebase obsolete commits with no successor
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 20:59:17 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Sun, 15 Nov 2015 22:18:48 +0100 |
liscju |
rebase: add returning value from pullrebase function
stable
|
file |
diff |
annotate
|
| Sun, 08 Nov 2015 17:56:48 -0500 |
Matt Harbison |
rebase: preserve the 'intermediate-source' attribute of grafts
|
file |
diff |
annotate
|
| Mon, 26 Oct 2015 02:35:48 -0700 |
Stanislau Hlebik |
rebase: pass date parameter to concludenode
|
file |
diff |
annotate
|
| Mon, 26 Oct 2015 02:22:26 -0700 |
Stanislau Hlebik |
rebase: add date parameter to concludenode function
|
file |
diff |
annotate
|
| Mon, 19 Oct 2015 16:29:35 +0200 |
Mads Kiilerich |
rebase: fix wrong 'no changes to commit' when using --collapse
|
file |
diff |
annotate
|
| Sat, 17 Oct 2015 00:58:46 +0200 |
Mads Kiilerich |
spelling: trivial spell checking
|
file |
diff |
annotate
|
| Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
dirstate: make dirstate.write() callers pass transaction object to it
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 15:20:44 -0700 |
Christian Delahousse |
rebase: reduce scope of try catch in restorestate
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 12:13:46 -0700 |
Christian Delahousse |
rebase: on abort delete rebase state file no matter what
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:56:03 +0100 |
Pierre-Yves David |
rebase: rename and test '_destrebase'
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:51:53 +0100 |
Pierre-Yves David |
rebase: directly use '_destrebase'
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 01:50:31 +0100 |
Pierre-Yves David |
rebase: extra default destination in its own function
|
file |
diff |
annotate
|
| Tue, 13 Oct 2015 14:06:51 -0700 |
Christian Delahousse |
rebase: properly abort when destination is public (issue4896)
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 00:32:20 +0100 |
Pierre-Yves David |
rebase: properly handle chains of markers with missing nodes
|
file |
diff |
annotate
|
| Wed, 14 Oct 2015 23:42:15 +0100 |
Pierre-Yves David |
rebase: use a direct reference to repo.changelog
|
file |
diff |
annotate
|
| Tue, 13 Oct 2015 03:20:05 -0700 |
Ryan McElroy |
rebase: factor out nothing to rebase return code
|
file |
diff |
annotate
|
| Tue, 13 Oct 2015 14:17:15 -0700 |
Christian Delahousse |
rebase: added comments
|
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
|
| Tue, 06 Oct 2015 15:07:00 -0400 |
timeless |
rebase: enable histedit for useful help with it
|
file |
diff |
annotate
|
| Tue, 06 Oct 2015 15:01:25 -0400 |
timeless |
rebase: suggest help -e histedit
|
file |
diff |
annotate
|
| Tue, 06 Oct 2015 15:05:40 -0400 |
timeless |
rebase: factor out histedit help command
|
file |
diff |
annotate
|
| Wed, 30 Sep 2015 15:43:49 -0500 |
Matt Mackall |
urls: bulk-change primary website URLs
|
file |
diff |
annotate
|
| Thu, 24 Sep 2015 17:51:05 -0400 |
timeless |
rebase: avoid losing branch commits with --keepbranch (issue4835)
|
file |
diff |
annotate
|
| Mon, 14 Sep 2015 17:31:48 -0700 |
Laurent Charignon |
rebase: don't rebase obsolete commit whose successor is already rebased
|
file |
diff |
annotate
|
| Thu, 17 Sep 2015 10:59:52 -0700 |
Pierre-Yves David |
rebase: move destination computation in a revset
|
file |
diff |
annotate
|
| Tue, 01 Sep 2015 21:37:51 +0200 |
liscju |
rebase: fix warning about ignoring tool option on rebase continue (issue4698)
|
file |
diff |
annotate
|
| Tue, 11 Aug 2015 16:45:11 -0700 |
Pierre-Yves David |
rebase: lock the repo during the full rebase operation
stable
|
file |
diff |
annotate
|
| Tue, 23 Jun 2015 22:20:08 -0700 |
Gregory Szorc |
global: mass rewrite to use modern exception syntax
|
file |
diff |
annotate
|
| Mon, 01 Jun 2015 18:05:38 +0000 |
Jordi Gutiérrez Hermoso |
phases: rewrite "immutable changeset" to "public changeset"
|
file |
diff |
annotate
|
| Tue, 28 Apr 2015 16:44:37 -0400 |
Augie Fackler |
extensions: document that `testedwith = 'internal'` is special
|
file |
diff |
annotate
|
| Fri, 15 May 2015 11:52:09 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Thu, 14 May 2015 21:35:06 -0700 |
Tony Tung |
rebase: check that the bookmark is still valid when restoring (issue4669)
stable
|
file |
diff |
annotate
|
| Thu, 14 May 2015 21:34:46 -0700 |
Tony Tung |
rebase: remove extraneous blank at the end of file
|
file |
diff |
annotate
|
| Thu, 14 May 2015 16:28:28 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Sun, 10 May 2015 10:57:24 -0400 |
Jordi Gutiérrez Hermoso |
rebase: clear merge when aborting before any rebasing (issue4661)
stable
|
file |
diff |
annotate
|
| Tue, 12 May 2015 15:04:19 -0700 |
Nat Mote |
rebase: add short -k option for --keep
|
file |
diff |
annotate
|
| Thu, 07 May 2015 12:07:11 +0900 |
FUJIWARA Katsunori |
rebase: use dirstateguard instead of dirstate.invalidate
|
file |
diff |
annotate
|
| Tue, 14 Apr 2015 13:17:33 -0700 |
Ryan McElroy |
bookmarks: rename bookmarkcurrent to activebookmark (API)
|
file |
diff |
annotate
|
| Mon, 13 Apr 2015 22:27:01 -0700 |
Ryan McElroy |
bookmarks: rename setcurrent to activate (API)
|
file |
diff |
annotate
|
| Mon, 13 Apr 2015 21:53:37 -0700 |
Ryan McElroy |
bookmarks: rename unsetcurrent to deactivate (API)
|
file |
diff |
annotate
|
| Tue, 28 Apr 2015 10:19:46 -0700 |
Gregory Szorc |
rebase: don't forward "source" argument to rebase (issue4633)
stable
|
file |
diff |
annotate
|
| Mon, 13 Apr 2015 14:54:02 -0400 |
Tony Tung |
rebase: restore bookmark state on abort
|
file |
diff |
annotate
|
| Tue, 27 Jan 2015 12:33:56 +0000 |
Pierre-Yves David |
rebase: ensure rebase revision remains visible (issue4504)
stable
|
file |
diff |
annotate
|
| Sat, 17 Jan 2015 22:01:14 -0200 |
Wagner Bruna |
messages: quote "hg help" hints consistently
|
file |
diff |
annotate
|
| Thu, 15 Jan 2015 23:17:12 +0100 |
Angel Ezquerra |
localrepo: remove all external users of localrepo.opener
|
file |
diff |
annotate
|
| Sun, 04 Jan 2015 01:29:07 +0100 |
Mads Kiilerich |
rebase: clarify comment about merge ancestor when rebasing merges
|
file |
diff |
annotate
|
| Thu, 11 Oct 2012 23:22:02 +0200 |
Mads Kiilerich |
rebase: show a note for updated mq patches
|
file |
diff |
annotate
|
| Wed, 10 Dec 2014 06:20:35 +0100 |
Mads Kiilerich |
rebase: improve debug messages while processing the list of rebases
|
file |
diff |
annotate
|
| Wed, 10 Dec 2014 06:20:35 +0100 |
Mads Kiilerich |
rebase: show warning when rebase creates no changes to commit
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 03:45:26 +0100 |
Mads Kiilerich |
rebase: show more useful status information while rebasing
|
file |
diff |
annotate
|
| Tue, 02 Dec 2014 12:23:12 -0800 |
Pierre-Yves David |
rebase: handle revtodo as a special value when storing/restoring state
|
file |
diff |
annotate
|
| Tue, 02 Dec 2014 09:46:20 -0800 |
Pierre-Yves David |
rebase: add a 'revtodo' constant
|
file |
diff |
annotate
|
| Thu, 04 Dec 2014 07:03:02 -0800 |
Pierre-Yves David |
rebase: use '>= 0' to know is a revision was rebased
|
file |
diff |
annotate
|
| Wed, 19 Nov 2014 03:38:51 +0100 |
Mads Kiilerich |
rebase: move base calculation from rebasenode() to defineparents()
|
file |
diff |
annotate
|
| Tue, 02 Dec 2014 05:12:59 +0100 |
Mads Kiilerich |
rebase: avoid redundant repo[rev].rev() - just keep working in rev space
|
file |
diff |
annotate
|
| Tue, 02 Dec 2014 05:12:59 +0100 |
Mads Kiilerich |
rebase: always store rev in state, also when collapsing
|
file |
diff |
annotate
|
| Tue, 02 Dec 2014 05:12:53 +0100 |
Mads Kiilerich |
rebase: clarify naming of variables holding node hashes - don't call them rev
|
file |
diff |
annotate
|
| Tue, 02 Dec 2014 17:19:20 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 02 Dec 2014 11:06:38 -0800 |
Pierre-Yves David |
rebase: ignore negative state when updating back to original wc parent
stable
|
file |
diff |
annotate
|
| Tue, 11 Nov 2014 18:43:19 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Mon, 10 Nov 2014 10:44:42 -0800 |
Durham Goode |
rebase: fix rebase with no common ancestors (issue4446)
stable 3.2.1
|
file |
diff |
annotate
|
| Thu, 17 Apr 2014 22:47:38 +0200 |
Mads Kiilerich |
spelling: fixes from proofreading of spell checker issues
|
file |
diff |
annotate
|
| Mon, 20 Oct 2014 18:50:09 -0700 |
Durham Goode |
rebase: improve base revset performance
stable
|
file |
diff |
annotate
|
| Tue, 14 Oct 2014 13:25:13 -0700 |
Durham Goode |
obsolete: add allowunstable option
|
file |
diff |
annotate
|
| Tue, 14 Oct 2014 13:23:52 -0700 |
Durham Goode |
obsolete: add createmarkers option
|
file |
diff |
annotate
|
| Mon, 13 Oct 2014 18:00:39 -0500 |
Matt Mackall |
rebase: fix some weird mixed-case naming
|
file |
diff |
annotate
|
| Mon, 13 Oct 2014 17:55:45 -0500 |
Matt Mackall |
rebase: move duplicatecopies next to merge
|
file |
diff |
annotate
|
| Mon, 13 Oct 2014 14:33:13 -0500 |
Matt Mackall |
duplicatecopies: move from cmdutil to copies
|
file |
diff |
annotate
|
| Tue, 07 Oct 2014 00:31:53 -0700 |
Pierre-Yves David |
rebase: transform the smartset to a list before comparing with a list
|
file |
diff |
annotate
|
| Tue, 07 Oct 2014 00:16:59 -0700 |
Pierre-Yves David |
rebase: use `last` instead of direct indexing
|
file |
diff |
annotate
|
| Wed, 08 Oct 2014 14:03:07 -0500 |
Matt Mackall |
rebase: add help examples
|
file |
diff |
annotate
|
| Wed, 08 Oct 2014 13:40:50 -0500 |
Matt Mackall |
rebase: attempt to clarify --base
|
file |
diff |
annotate
|
| Fri, 05 Sep 2014 11:36:20 -0700 |
Durham Goode |
dirstate: wrap setparent calls with begin/endparentchange (issue4353)
|
file |
diff |
annotate
|
| Tue, 19 Aug 2014 01:12:56 +0200 |
Mads Kiilerich |
rebase: improve description of --base
|
file |
diff |
annotate
|
| Mon, 01 Sep 2014 11:48:55 +0200 |
David Soria Parra |
rebase: add a deprecated -i/--interactive flag
|
file |
diff |
annotate
|
| Sat, 16 Aug 2014 10:43:59 +0900 |
FUJIWARA Katsunori |
rebase: change "editform" to distinguish merge commits from others
|
file |
diff |
annotate
|