| Fri, 08 Feb 2013 16:27:59 -0600 |
Augie Fackler |
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
|
file |
diff |
annotate
|
| Tue, 12 Mar 2013 10:43:59 -0700 |
Bryan O'Sullivan |
merge with crew-stable
|
file |
diff |
annotate
|
| Mon, 11 Mar 2013 15:37:28 -0700 |
Durham Goode |
rebase: restore active bookmark after rebase --continue
stable
|
file |
diff |
annotate
|
| Sun, 10 Feb 2013 18:24:29 +0100 |
Mads Kiilerich |
spelling: fix some minor issues found by spell checker
|
file |
diff |
annotate
|
| Sun, 03 Feb 2013 14:26:39 -0800 |
Siddharth Agarwal |
rebase: derive node from target rev (issue3802)
stable
|
file |
diff |
annotate
|
| Fri, 01 Feb 2013 02:01:11 +0100 |
Pierre-Yves David |
rebase: mention --rev in the help
stable
|
file |
diff |
annotate
|
| Thu, 31 Jan 2013 20:01:26 -0600 |
Kevin Bullock |
rebase: mention phases in the help
stable
|
file |
diff |
annotate
|
| Wed, 30 Jan 2013 16:08:32 -0800 |
Siddharth Agarwal |
rebase: delete divergent bookmarks on destination (issue3685)
stable
|
file |
diff |
annotate
|
| Wed, 30 Jan 2013 17:49:54 -0800 |
Siddharth Agarwal |
rebase: remove bogus nullmerge check in updatebookmarks
stable
|
file |
diff |
annotate
|
| Fri, 18 Jan 2013 23:41:48 +0100 |
Pierre-Yves David |
rebase: properly handle unrebased revision between rebased one
|
file |
diff |
annotate
|
| Fri, 18 Jan 2013 23:21:32 +0100 |
Pierre-Yves David |
rebase: lose the comparison to `nullmerge`
|
file |
diff |
annotate
|
| Fri, 18 Jan 2013 14:15:32 +0100 |
Pierre-Yves David |
rebase: do not invent successor to skipped changeset
|
file |
diff |
annotate
|
| Thu, 17 Jan 2013 00:35:01 +0100 |
Pierre-Yves David |
rebase: support multiple roots for rebaseset
|
file |
diff |
annotate
|
| Tue, 15 Jan 2013 23:30:10 +0100 |
Mads Kiilerich |
refactoring: use unlinkpath with ignoremissing
|
file |
diff |
annotate
|
| Tue, 04 Dec 2012 14:58:19 +0100 |
Pierre-Yves David |
clfilter: drop unnecessary explicit filtering on rebase
|
file |
diff |
annotate
|
| Mon, 31 Dec 2012 17:45:52 -0600 |
Pierre-Yves David |
rebase: allow non-head rebase-set when obsolete is enabled
|
file |
diff |
annotate
|
| Mon, 17 Dec 2012 20:51:21 -0800 |
Siddharth Agarwal |
rebase: use lazy ancestor membership testing
|
file |
diff |
annotate
|
| Thu, 29 Nov 2012 11:44:22 -0600 |
Augie Fackler |
Merge with stable.
|
file |
diff |
annotate
|
| Thu, 29 Nov 2012 16:37:15 +0100 |
Pierre-Yves David |
rebase: fix pull --rev options clashing with --rebase (issue3619)
stable
|
file |
diff |
annotate
|
| Tue, 27 Nov 2012 16:24:21 -0800 |
Siddharth Agarwal |
rebase: use revlog.findmissingrevs to compute detach set
|
file |
diff |
annotate
|
| Wed, 07 Nov 2012 16:21:39 -0600 |
Augie Fackler |
bookmarks: introduce a bmstore to manage bookmark persistence
|
file |
diff |
annotate
|
| Tue, 18 Sep 2012 23:32:42 +0200 |
Pierre-Yves David |
rebase: ensure rebase does not revive extinct revision
|
file |
diff |
annotate
|
| Tue, 18 Sep 2012 23:29:05 +0200 |
Pierre-Yves David |
rebase: remove useless list around repo.revs
|
file |
diff |
annotate
|
| Tue, 18 Sep 2012 23:42:27 +0200 |
Pierre-Yves David |
rebase: properly handle --collapse when creating obsolescence marker
|
file |
diff |
annotate
|
| Tue, 18 Sep 2012 23:13:31 +0200 |
Pierre-Yves David |
rebase: allow creation obsolescence relation instead of stripping
|
file |
diff |
annotate
|
| Tue, 18 Sep 2012 22:58:12 +0200 |
Pierre-Yves David |
rebase: extract final changesets cleanup logic in a dedicated function
|
file |
diff |
annotate
|
| Tue, 31 Jul 2012 18:18:26 +0200 |
Patrick Mezard |
rebase: remove second broken synopsis line (issue3172)
stable
|
file |
diff |
annotate
|
| Fri, 29 Jun 2012 00:40:52 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Fri, 22 Jun 2012 11:40:31 -0700 |
David Schleimer |
bookmarks: correctly update current bookmarks on rebase (issue2277)
stable
|
file |
diff |
annotate
|
| Thu, 21 Jun 2012 17:37:02 -0500 |
Matt Mackall |
merge with crew
|
file |
diff |
annotate
|
| Thu, 21 Jun 2012 15:10:01 +0200 |
Martin Geisler |
merge with stable
|
file |
diff |
annotate
|
| Mon, 18 Jun 2012 11:16:24 +0200 |
Dan Villiom Podlaski Christiansen |
rebase: improve error message on improper phases
stable
|
file |
diff |
annotate
|
| Wed, 20 Jun 2012 20:08:57 +0200 |
Pierre-Yves David |
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
|
file |
diff |
annotate
|
| Fri, 01 Jun 2012 12:45:16 -0700 |
Bryan O'Sullivan |
revlog: descendants(*revs) becomes descendants(revs) (API)
|
file |
diff |
annotate
|
| Fri, 01 Jun 2012 12:37:18 -0700 |
Bryan O'Sullivan |
revlog: ancestors(*revs) becomes ancestors(revs) (API)
|
file |
diff |
annotate
|
| Tue, 15 May 2012 14:37:49 -0500 |
Augie Fackler |
hgext: mark all first-party extensions as such
|
file |
diff |
annotate
|
| Thu, 03 May 2012 15:14:58 +0200 |
Patrick Mezard |
rebase: allow collapsing branches in place (issue3111)
|
file |
diff |
annotate
|
| Tue, 01 May 2012 10:14:35 +0200 |
Patrick Mezard |
rebase: make --dest understand revsets
|
file |
diff |
annotate
|
| Wed, 02 May 2012 11:43:12 +0200 |
Patrick Mezard |
rebase: add missing EOL to debug strings
|
file |
diff |
annotate
|
| Sun, 29 Apr 2012 22:25:55 +0200 |
Patrick Mezard |
localrepo: add setparents() to adjust dirstate copies (issue3407)
stable
|
file |
diff |
annotate
|
| Wed, 25 Apr 2012 17:04:18 +0200 |
Patrick Mezard |
rebase: preserve mq series order, guarded patches (issue2849)
stable
|
file |
diff |
annotate
|
| Thu, 22 Mar 2012 17:47:00 -0500 |
Matt Mackall |
rebase: properly calculate descendant set when aborting (issue3332)
stable
|
file |
diff |
annotate
|
| Sun, 04 Mar 2012 17:12:12 -0600 |
Matt Mackall |
rebase: move bookmarks as needed with pull --rebase (issue3285)
stable
|
file |
diff |
annotate
|
| Fri, 20 Jan 2012 12:04:45 -0200 |
Wagner Bruna |
rebase: drop uppercase in abort message
stable
|
file |
diff |
annotate
|
| Wed, 18 Jan 2012 18:14:55 -0600 |
Matt Mackall |
rebase: only advance phase on successful commit
|
file |
diff |
annotate
|
| Tue, 17 Jan 2012 09:12:14 +0100 |
Alain Leufroy |
rebase: fix phases movement
|
file |
diff |
annotate
|
| Tue, 17 Jan 2012 02:55:55 +0100 |
Mads Kiilerich |
rebase: write series file without removed mq patches
|
file |
diff |
annotate
|
| Fri, 13 Jan 2012 01:19:07 +0100 |
Mads Kiilerich |
rebase: take locks in the right order
|
file |
diff |
annotate
|
| Mon, 09 Jan 2012 20:16:57 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Sun, 08 Jan 2012 23:09:35 +0800 |
Steven Brown |
rebase: reinstate old-style rev spec support for the source and base (issue3181)
stable
|
file |
diff |
annotate
|
| Thu, 05 Jan 2012 20:35:10 -0600 |
Matt Mackall |
cmdutil: simplify duplicatecopies
|
file |
diff |
annotate
|
| Tue, 27 Dec 2011 00:11:22 +0100 |
Pierre-Yves David |
phases: prevent rebase to rebase immutable changeset.
|
file |
diff |
annotate
|
| Tue, 27 Dec 2011 21:12:09 +0100 |
Pierre-Yves David |
rebase: add a "D" short option for detach
|
file |
diff |
annotate
|
| Tue, 27 Dec 2011 20:45:46 +0100 |
Pierre-Yves David |
rebase: allow --detach when --rev is used
|
file |
diff |
annotate
|
| Thu, 10 Nov 2011 11:00:27 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 08 Nov 2011 17:09:48 +0100 |
Stefano Tortarolo |
rebase: ensure target is not taken as external (issue3085)
stable
|
file |
diff |
annotate
|
| Sun, 06 Nov 2011 23:35:33 +0100 |
Stefano Tortarolo |
rebase: treat nullmerge as a special case in rebasestate (issue3046)
stable
|
file |
diff |
annotate
|
| Wed, 02 Nov 2011 13:51:16 -0500 |
Matt Mackall |
localrepo: convert various repo.set() users to repo.revs()
|
file |
diff |
annotate
|
| Mon, 17 Oct 2011 14:47:36 -0200 |
Wagner Bruna |
rebase: fix typos
stable
|
file |
diff |
annotate
|
| Sat, 15 Oct 2011 14:19:24 -0500 |
Matt Mackall |
rebase: simplify check for orphaned descendants
|
file |
diff |
annotate
|
| Sat, 15 Oct 2011 14:19:07 -0500 |
Matt Mackall |
rebase: simplify set generation
|
file |
diff |
annotate
|
| Sat, 15 Oct 2011 20:12:32 +0200 |
Pierre-Yves David |
rebase: add --rev option to rebase
|
file |
diff |
annotate
|
| Sat, 15 Oct 2011 12:57:47 -0500 |
Matt Mackall |
rebase: allow revsets for source and base args
|
file |
diff |
annotate
|
| Sat, 15 Oct 2011 19:07:51 +0200 |
Pierre-Yves David |
rebase: use revset as soon as possible in internal logic
|
file |
diff |
annotate
|
| Mon, 10 Oct 2011 23:01:25 -0500 |
Matt Mackall |
rebase: add --edit switch
|
file |
diff |
annotate
|
| Sun, 09 Oct 2011 16:14:37 -0500 |
Matt Mackall |
rebase: move updatedirstate into cmdutil so it can be shared
|
file |
diff |
annotate
|
| Mon, 19 Sep 2011 16:57:13 +0200 |
Pierre-Yves David |
rebase: allow rebase to ancestor (issue3010)
|
file |
diff |
annotate
|
| Thu, 21 Jul 2011 15:56:15 -0500 |
Augie Fackler |
rebase: remove trailing whitespace found by check-code
stable
|
file |
diff |
annotate
|
| Mon, 18 Jul 2011 22:58:21 +0200 |
Stefano Tortarolo |
rebase: block collapse with keepbranches on multiple named branches (issue2112)
stable
|
file |
diff |
annotate
|
| Fri, 15 Jul 2011 20:07:19 +0200 |
Stefano Tortarolo |
rebase: reset bookmarks (issue2265 and issue2873)
stable
|
file |
diff |
annotate
|
| Wed, 08 Jun 2011 14:54:52 +0300 |
Idan Kamara |
cmdutil, logmessage: use ui.fin when reading from '-'
|
file |
diff |
annotate
|
| Sun, 12 Jun 2011 17:26:58 +0300 |
Idan Kamara |
rebase: preserve mq series order after rebasing (issue2849)
|
file |
diff |
annotate
|
| Mon, 13 Jun 2011 12:02:14 +0200 |
Adrian Buehlmann |
mq: rename save_dirty to savedirty
|
file |
diff |
annotate
|
| Mon, 13 Jun 2011 11:06:11 +0200 |
Adrian Buehlmann |
mq: rename full_series to fullseries
|
file |
diff |
annotate
|
| Wed, 01 Jun 2011 16:42:50 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Sat, 26 Mar 2011 13:05:17 +0100 |
Stefano Tortarolo |
rebase: restore mq guards after rebasing (issue2107)
stable
|
file |
diff |
annotate
|
| Fri, 27 May 2011 10:03:29 +0200 |
Adrian Buehlmann |
rebase: add option --tool/-t for 'pull --rebase'
|
file |
diff |
annotate
|
| Thu, 12 May 2011 17:09:56 +0200 |
Adrian Buehlmann |
rebase: use cmdutil.command decorator
|
file |
diff |
annotate
|
| Tue, 10 May 2011 16:08:46 -0500 |
Matt Mackall |
cmdutil: bail_if_changed to bailifchanged
|
file |
diff |
annotate
|
| Tue, 05 Apr 2011 16:11:40 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Sun, 27 Mar 2011 13:34:20 +0200 |
Stefano Tortarolo |
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
stable
|
file |
diff |
annotate
|
| Mon, 04 Apr 2011 23:14:03 -0500 |
Matt Mackall |
rebase: drop ancestor import
|
file |
diff |
annotate
|
| Mon, 04 Apr 2011 16:58:24 -0500 |
Matt Mackall |
rebase: drop unused p2 arg from rebasenode
|
file |
diff |
annotate
|
| Mon, 04 Apr 2011 16:21:59 -0500 |
Matt Mackall |
misc: replace .parents()[0] with p1()
|
file |
diff |
annotate
|
| Mon, 04 Apr 2011 15:30:54 -0500 |
Matt Mackall |
rebase: use merge's ancestor parameter
|
file |
diff |
annotate
|
| Sat, 02 Apr 2011 11:07:05 +0200 |
Stefano Tortarolo |
rebase: add --tool argument for specifying merge tool
|
file |
diff |
annotate
|
| Sun, 27 Mar 2011 13:34:20 +0200 |
Stefano Tortarolo |
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
|
file |
diff |
annotate
|
| Sat, 26 Mar 2011 13:05:17 +0100 |
Stefano Tortarolo |
rebase: restore mq guards after rebasing (issue2107)
|
file |
diff |
annotate
|
| Wed, 23 Mar 2011 01:14:43 +0100 |
Stefano Tortarolo |
rebase: allow for rebasing descendants onto ancestors on different named branches
|
file |
diff |
annotate
|
| Tue, 15 Mar 2011 18:33:36 +0100 |
Radomir Dopieralski |
rebase: add -m/--message to rebase --collapse (issue2389)
|
file |
diff |
annotate
|
| Sun, 13 Mar 2011 13:52:47 +0100 |
Martin Geisler |
rebase: don't use util.Abort for an internal error
|
file |
diff |
annotate
|
| Sun, 02 Jan 2011 19:34:41 +0100 |
Adrian Buehlmann |
rename util.unlink to unlinkpath
|
file |
diff |
annotate
|
| Sat, 20 Nov 2010 09:51:56 +0100 |
Henrik Stuart |
rebase: support --detach when null is common ancestor
stable
|
file |
diff |
annotate
|
| Sat, 30 Oct 2010 16:58:15 -0500 |
Steve Borho |
rebase: improve resolve failure message
stable
|
file |
diff |
annotate
|
| Tue, 26 Oct 2010 14:41:58 +0300 |
timeless |
rebase: abort message should appear even with --quiet
stable
|
file |
diff |
annotate
|
| Tue, 20 Jul 2010 20:53:48 +0200 |
timeless |
progress: dropping superfluous space from units
|
file |
diff |
annotate
|
| Fri, 27 Aug 2010 13:32:38 -0400 |
Brodie Rao |
cleanup: remove unused imports
|
file |
diff |
annotate
|
| Sat, 14 Aug 2010 03:30:35 +0200 |
Martin Geisler |
Merge with stable
|
file |
diff |
annotate
|
| Fri, 13 Aug 2010 18:02:02 +0200 |
Benoit Boissinot |
rebase: recompute the set of skipped rev when using --continue (issue2330)
stable
|
file |
diff |
annotate
|
| Sat, 07 Aug 2010 12:55:30 +0800 |
Alecs King |
minor style fix: hgext/rebase.py:157 -- line too long
|
file |
diff |
annotate
|
| Tue, 20 Jul 2010 20:53:48 +0200 |
timeless |
rebase/progress: Adding progress for rebasing
|
file |
diff |
annotate
|
| Tue, 13 Jul 2010 22:30:01 +0900 |
Nicolas Dumazet |
mq: qrepo.add(mq.added) inside save_dirty inside of doing it manually
stable
|
file |
diff |
annotate
|
| Mon, 12 Jul 2010 19:04:07 +0900 |
Nicolas Dumazet |
rebase: small cosmetic cleanups
stable
|
file |
diff |
annotate
|
| Tue, 13 Jul 2010 20:12:32 +0900 |
Nicolas Dumazet |
rebase: re-add patches to mq repo after rebase
stable
|
file |
diff |
annotate
|
| Sun, 06 Jun 2010 17:25:00 +0900 |
FUJIWARA Katsunori |
help: show value requirement and multiple occurrence of options
|
file |
diff |
annotate
|
| Tue, 08 Jun 2010 18:01:07 +0200 |
Stefano Tortarolo |
rebase: --abort doesn't strip away the target changeset (issue2220)
|
file |
diff |
annotate
|
| Fri, 04 Jun 2010 17:22:33 -0500 |
Matt Mackall |
rebase: use usual util.abort rather than error.ParseError
|
file |
diff |
annotate
|
| Thu, 20 May 2010 15:58:16 -0500 |
Matt Mackall |
rebase: add error codes
|
file |
diff |
annotate
|
| Thu, 20 May 2010 15:20:25 -0500 |
Matt Mackall |
rebase: improve --abort failure message
|
file |
diff |
annotate
|
| Thu, 20 May 2010 15:15:11 -0500 |
Matt Mackall |
rebase: only show "rebase completed" message with -v
|
file |
diff |
annotate
|
| Thu, 20 May 2010 12:21:35 -0500 |
Matt Mackall |
Fix up rebase's handling of strip backups
|
file |
diff |
annotate
|
| Mon, 17 May 2010 21:30:00 +0200 |
Martin Geisler |
Merge with stable
|
file |
diff |
annotate
|
| Mon, 17 May 2010 21:16:35 +0200 |
Martin Geisler |
rebase: stress that only local changesets should be rebased
stable
|
file |
diff |
annotate
|
| Tue, 23 Mar 2010 22:59:31 +0100 |
Patrick Mezard |
Merge with crew-stable
|
file |
diff |
annotate
|
| Tue, 23 Mar 2010 20:45:08 +0100 |
Patrick Mezard |
rebase: fix --collapse with --keepbranches (issue2100)
stable
|
file |
diff |
annotate
|
| Sun, 14 Mar 2010 00:36:10 +0100 |
Benoit Boissinot |
mq: avoid many hex/bin conversions, keep the binary node when possible
|
file |
diff |
annotate
|
| Sun, 07 Feb 2010 17:12:41 +0100 |
Stefano Tortarolo |
rebase: add option to not commit after a collapsing
|
file |
diff |
annotate
|
| Sat, 13 Mar 2010 20:02:46 +0100 |
Patrick Mezard |
Merge with crew-stable
|
file |
diff |
annotate
|
| Tue, 02 Mar 2010 15:08:43 -0500 |
Greg Ward |
rebase: always check if rebasing onto an applied mq patch.
stable
|
file |
diff |
annotate
|
| Fri, 12 Mar 2010 00:50:41 +0100 |
Martin Geisler |
Merge with stable
|
file |
diff |
annotate
|