Mercurial > hg

log hgext/rebase.py @ 17064:168cc52ad7c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -120 tip
age author description
Fri, 29 Jun 2012 00:40:52 -0500 Matt Mackall merge with stable
Fri, 22 Jun 2012 11:40:31 -0700 David Schleimer bookmarks: correctly update current bookmarks on rebase (issue2277) stable
Thu, 21 Jun 2012 17:37:02 -0500 Matt Mackall merge with crew
Thu, 21 Jun 2012 15:10:01 +0200 Martin Geisler merge with stable
Mon, 18 Jun 2012 11:16:24 +0200 Dan Villiom Podlaski Christiansen rebase: improve error message on improper phases stable
Wed, 20 Jun 2012 20:08:57 +0200 Pierre-Yves David rebase: do not add second parent to rebased changeset (drop detach option) (BC)
Fri, 01 Jun 2012 12:45:16 -0700 Bryan O'Sullivan revlog: descendants(*revs) becomes descendants(revs) (API)
Fri, 01 Jun 2012 12:37:18 -0700 Bryan O'Sullivan revlog: ancestors(*revs) becomes ancestors(revs) (API)
Tue, 15 May 2012 14:37:49 -0500 Augie Fackler hgext: mark all first-party extensions as such
Thu, 03 May 2012 15:14:58 +0200 Patrick Mezard rebase: allow collapsing branches in place (issue3111)
Tue, 01 May 2012 10:14:35 +0200 Patrick Mezard rebase: make --dest understand revsets
Wed, 02 May 2012 11:43:12 +0200 Patrick Mezard rebase: add missing EOL to debug strings
Sun, 29 Apr 2012 22:25:55 +0200 Patrick Mezard localrepo: add setparents() to adjust dirstate copies (issue3407) stable
Wed, 25 Apr 2012 17:04:18 +0200 Patrick Mezard rebase: preserve mq series order, guarded patches (issue2849) stable
Thu, 22 Mar 2012 17:47:00 -0500 Matt Mackall rebase: properly calculate descendant set when aborting (issue3332) stable
Sun, 04 Mar 2012 17:12:12 -0600 Matt Mackall rebase: move bookmarks as needed with pull --rebase (issue3285) stable
Fri, 20 Jan 2012 12:04:45 -0200 Wagner Bruna rebase: drop uppercase in abort message stable
Wed, 18 Jan 2012 18:14:55 -0600 Matt Mackall rebase: only advance phase on successful commit
Tue, 17 Jan 2012 09:12:14 +0100 Alain Leufroy rebase: fix phases movement
Tue, 17 Jan 2012 02:55:55 +0100 Mads Kiilerich rebase: write series file without removed mq patches
Fri, 13 Jan 2012 01:19:07 +0100 Mads Kiilerich rebase: take locks in the right order
Mon, 09 Jan 2012 20:16:57 -0600 Matt Mackall merge with stable
Sun, 08 Jan 2012 23:09:35 +0800 Steven Brown rebase: reinstate old-style rev spec support for the source and base (issue3181) stable
Thu, 05 Jan 2012 20:35:10 -0600 Matt Mackall cmdutil: simplify duplicatecopies
Tue, 27 Dec 2011 00:11:22 +0100 Pierre-Yves David phases: prevent rebase to rebase immutable changeset.
Tue, 27 Dec 2011 21:12:09 +0100 Pierre-Yves David rebase: add a "D" short option for detach
Tue, 27 Dec 2011 20:45:46 +0100 Pierre-Yves David rebase: allow --detach when --rev is used
Thu, 10 Nov 2011 11:00:27 -0600 Matt Mackall merge with stable
Tue, 08 Nov 2011 17:09:48 +0100 Stefano Tortarolo rebase: ensure target is not taken as external (issue3085) stable
Sun, 06 Nov 2011 23:35:33 +0100 Stefano Tortarolo rebase: treat nullmerge as a special case in rebasestate (issue3046) stable
Wed, 02 Nov 2011 13:51:16 -0500 Matt Mackall localrepo: convert various repo.set() users to repo.revs()
Mon, 17 Oct 2011 14:47:36 -0200 Wagner Bruna rebase: fix typos stable
Sat, 15 Oct 2011 14:19:24 -0500 Matt Mackall rebase: simplify check for orphaned descendants
Sat, 15 Oct 2011 14:19:07 -0500 Matt Mackall rebase: simplify set generation
Sat, 15 Oct 2011 20:12:32 +0200 Pierre-Yves David rebase: add --rev option to rebase
Sat, 15 Oct 2011 12:57:47 -0500 Matt Mackall rebase: allow revsets for source and base args
Sat, 15 Oct 2011 19:07:51 +0200 Pierre-Yves David rebase: use revset as soon as possible in internal logic
Mon, 10 Oct 2011 23:01:25 -0500 Matt Mackall rebase: add --edit switch
Sun, 09 Oct 2011 16:14:37 -0500 Matt Mackall rebase: move updatedirstate into cmdutil so it can be shared
Mon, 19 Sep 2011 16:57:13 +0200 Pierre-Yves David rebase: allow rebase to ancestor (issue3010)
Thu, 21 Jul 2011 15:56:15 -0500 Augie Fackler rebase: remove trailing whitespace found by check-code stable
Mon, 18 Jul 2011 22:58:21 +0200 Stefano Tortarolo rebase: block collapse with keepbranches on multiple named branches (issue2112) stable
Fri, 15 Jul 2011 20:07:19 +0200 Stefano Tortarolo rebase: reset bookmarks (issue2265 and issue2873) stable
Wed, 08 Jun 2011 14:54:52 +0300 Idan Kamara cmdutil, logmessage: use ui.fin when reading from '-'
Sun, 12 Jun 2011 17:26:58 +0300 Idan Kamara rebase: preserve mq series order after rebasing (issue2849)
Mon, 13 Jun 2011 12:02:14 +0200 Adrian Buehlmann mq: rename save_dirty to savedirty
Mon, 13 Jun 2011 11:06:11 +0200 Adrian Buehlmann mq: rename full_series to fullseries
Wed, 01 Jun 2011 16:42:50 -0500 Matt Mackall merge with stable
Sat, 26 Mar 2011 13:05:17 +0100 Stefano Tortarolo rebase: restore mq guards after rebasing (issue2107) stable
Fri, 27 May 2011 10:03:29 +0200 Adrian Buehlmann rebase: add option --tool/-t for 'pull --rebase'
Thu, 12 May 2011 17:09:56 +0200 Adrian Buehlmann rebase: use cmdutil.command decorator
Tue, 10 May 2011 16:08:46 -0500 Matt Mackall cmdutil: bail_if_changed to bailifchanged
Tue, 05 Apr 2011 16:11:40 -0500 Matt Mackall merge with stable
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
Mon, 04 Apr 2011 23:14:03 -0500 Matt Mackall rebase: drop ancestor import
Mon, 04 Apr 2011 16:58:24 -0500 Matt Mackall rebase: drop unused p2 arg from rebasenode
Mon, 04 Apr 2011 16:21:59 -0500 Matt Mackall misc: replace .parents()[0] with p1()
Mon, 04 Apr 2011 15:30:54 -0500 Matt Mackall rebase: use merge's ancestor parameter
Sat, 02 Apr 2011 11:07:05 +0200 Stefano Tortarolo rebase: add --tool argument for specifying merge tool
Sun, 27 Mar 2011 13:34:20 +0200 Stefano Tortarolo rebase: don't mark file as removed if missing in parent's manifest (issue2725)
Sat, 26 Mar 2011 13:05:17 +0100 Stefano Tortarolo rebase: restore mq guards after rebasing (issue2107)
Wed, 23 Mar 2011 01:14:43 +0100 Stefano Tortarolo rebase: allow for rebasing descendants onto ancestors on different named branches
Tue, 15 Mar 2011 18:33:36 +0100 Radomir Dopieralski rebase: add -m/--message to rebase --collapse (issue2389)
Sun, 13 Mar 2011 13:52:47 +0100 Martin Geisler rebase: don't use util.Abort for an internal error
Sun, 02 Jan 2011 19:34:41 +0100 Adrian Buehlmann rename util.unlink to unlinkpath
Sat, 20 Nov 2010 09:51:56 +0100 Henrik Stuart rebase: support --detach when null is common ancestor stable
Sat, 30 Oct 2010 16:58:15 -0500 Steve Borho rebase: improve resolve failure message stable
Tue, 26 Oct 2010 14:41:58 +0300 timeless rebase: abort message should appear even with --quiet stable
Tue, 20 Jul 2010 20:53:48 +0200 timeless progress: dropping superfluous space from units
Fri, 27 Aug 2010 13:32:38 -0400 Brodie Rao cleanup: remove unused imports
Sat, 14 Aug 2010 03:30:35 +0200 Martin Geisler Merge with stable
Fri, 13 Aug 2010 18:02:02 +0200 Benoit Boissinot rebase: recompute the set of skipped rev when using --continue (issue2330) stable
Sat, 07 Aug 2010 12:55:30 +0800 Alecs King minor style fix: hgext/rebase.py:157 -- line too long
Tue, 20 Jul 2010 20:53:48 +0200 timeless rebase/progress: Adding progress for rebasing
Tue, 13 Jul 2010 22:30:01 +0900 Nicolas Dumazet mq: qrepo.add(mq.added) inside save_dirty inside of doing it manually stable
Mon, 12 Jul 2010 19:04:07 +0900 Nicolas Dumazet rebase: small cosmetic cleanups stable
Tue, 13 Jul 2010 20:12:32 +0900 Nicolas Dumazet rebase: re-add patches to mq repo after rebase stable
Sun, 06 Jun 2010 17:25:00 +0900 FUJIWARA Katsunori help: show value requirement and multiple occurrence of options
Tue, 08 Jun 2010 18:01:07 +0200 Stefano Tortarolo rebase: --abort doesn't strip away the target changeset (issue2220)
Fri, 04 Jun 2010 17:22:33 -0500 Matt Mackall rebase: use usual util.abort rather than error.ParseError
Thu, 20 May 2010 15:58:16 -0500 Matt Mackall rebase: add error codes
Thu, 20 May 2010 15:20:25 -0500 Matt Mackall rebase: improve --abort failure message
Thu, 20 May 2010 15:15:11 -0500 Matt Mackall rebase: only show "rebase completed" message with -v
Thu, 20 May 2010 12:21:35 -0500 Matt Mackall Fix up rebase's handling of strip backups
Mon, 17 May 2010 21:30:00 +0200 Martin Geisler Merge with stable
Mon, 17 May 2010 21:16:35 +0200 Martin Geisler rebase: stress that only local changesets should be rebased stable
Tue, 23 Mar 2010 22:59:31 +0100 Patrick Mezard Merge with crew-stable
Tue, 23 Mar 2010 20:45:08 +0100 Patrick Mezard rebase: fix --collapse with --keepbranches (issue2100) stable
Sun, 14 Mar 2010 00:36:10 +0100 Benoit Boissinot mq: avoid many hex/bin conversions, keep the binary node when possible
Sun, 07 Feb 2010 17:12:41 +0100 Stefano Tortarolo rebase: add option to not commit after a collapsing
Sat, 13 Mar 2010 20:02:46 +0100 Patrick Mezard Merge with crew-stable
Tue, 02 Mar 2010 15:08:43 -0500 Greg Ward rebase: always check if rebasing onto an applied mq patch. stable
Fri, 12 Mar 2010 00:50:41 +0100 Martin Geisler Merge with stable
Fri, 12 Mar 2010 00:45:27 +0100 Martin Geisler rebase: remove unnecessary \" from help string stable
Thu, 11 Mar 2010 15:38:35 +0100 Dirkjan Ochtman merge with stable
Tue, 09 Mar 2010 21:53:16 -0500 Greg Ward rebase: improve help text stable
Tue, 09 Mar 2010 21:53:16 -0500 Greg Ward rebase: improve help text
Wed, 10 Mar 2010 12:38:33 +0100 Sune Foldager rebase: improve output of hg pull --rebase (issue2072)
Fri, 12 Feb 2010 15:17:10 +0100 Stefano Tortarolo rebase: split line longer than 80 chars
Tue, 09 Feb 2010 14:12:22 -0600 Matt Mackall fix up a bunch of check-code warnings
Sat, 06 Feb 2010 10:51:50 +0100 Stefano Tortarolo rebase: add --detach option to detach intermediate revisions (issue1950)
Sun, 31 Jan 2010 13:30:17 +0100 Stefano Tortarolo rebase: refactoring
Tue, 19 Jan 2010 22:20:08 -0600 Matt Mackall Update license to GPLv2+ stable
Mon, 09 Nov 2009 20:15:49 +0100 Christian Boos rebase: make sure the newancestor is used during the whole update
Fri, 16 Oct 2009 00:45:18 +0200 Martin Geisler Merge with crew-stable
Wed, 14 Oct 2009 20:55:39 +0300 timeless rebase: change rebase help to talk about changesets and branch names
Thu, 08 Oct 2009 10:39:43 +0200 Sune Foldager rebase: return early when source is descendant of destination
Thu, 08 Oct 2009 10:07:41 +0200 Sune Foldager rebase: improve error and debug messages
Sat, 19 Sep 2009 01:15:38 +0200 Martin Geisler do not attempt to translate ui.debug output
Mon, 03 Aug 2009 00:19:01 +0200 Martin Geisler rebase: link to RebaseExtension
Sun, 26 Jul 2009 01:59:59 +0200 Martin Geisler rebase: wrap docstrings at 70 characters
Wed, 22 Jul 2009 22:56:45 +0200 Martin Geisler merge with crew-stable
Wed, 22 Jul 2009 22:50:34 +0200 Martin Geisler do not translate commit messages
Tue, 07 Jul 2009 23:54:42 +0200 Martin Geisler rebase: wrapped docstrings at 78 characters
Wed, 24 Jun 2009 15:32:37 +0200 Dirkjan Ochtman change wiki/bts URLs to point to new hostname
Wed, 24 Jun 2009 13:42:02 +0200 Dirkjan Ochtman extensions: change descriptions for extensions providing a few commands
Mon, 01 Jun 2009 14:11:32 -0500 Matt Mackall commit: drop the now-unused files parameter
Mon, 01 Jun 2009 13:51:21 -0500 Matt Mackall rebase: remove unneeded status call before commit
Sun, 24 May 2009 22:37:20 +0200 Martin Geisler use ui instead of repo.ui when the former is in scope
Sun, 17 May 2009 02:55:22 +0200 Benoit Boissinot rebase: use set instead of dict
less more | (0) -120 tip