|File Search||Catalog||Content Search|
When conflicts occur when replaying patches, the user can resolve the conflict and continue the rebase using the 'rebase-continue' command or abort using the 'rebase-abort' command.
Other commands provided include 'replay' and 'rebase-foreign'.
This plugin provides a 'bzr rebase' command, in the same fashion of the famous git-rebase. ========== How to use ========== Simply run ``bzr rebase``, optionally specifying an upstream branch. If no branch is specified, it will use the current parent branch (which is usually what you want). If the rebase fails halfway through, perhaps because of conflicts replaying a revision, it will abort. more»
0.6.0 2010-03-27 BUG FIXES * Treat a stop revision as inclusive, not exclusive. (Max Bowsher, Jelmer Vernooij) * Fix rebase to not discard revisions off the leftmost path. (Robert Collins, Max Bowsher, #266897) * Mark as compatible with bzr 2.2. (Jelmer Vernooij) CHANGES * svn-upgrade/foreign-mapping-upgrade was removed. Use rebase-foreign instead. (Jelmer Ver more»
bzr-rewrite (0.6.0-1) unstable; urgency=low * New upstream release. * Rename package to bzr-rewrite, similar to upstream. -- Jelmer Vernooij <email@example.com> Tue, 23 Mar 2010 16:42:52 +0100 bzr-rebase (0.5.5-1) unstable; urgency=low * New upstream release. * Use source format 3. * Bump standards format to 3.8.4. -- Jelmer Vernooij <firstname.lastname@example.org> Sun, 07 Feb 2010 23:32:27 more»
Jelmer Vernooij <email@example.com> James Westby <firstname.lastname@example.org> Ian Clatworthy <ian.clat more»
This package was debianized by Jelmer Vernooij <email@example.com> on Sun Jul 15 00:20:04 EEST 2007. more»