emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: bzr workflow


From: Eli Zaretskii
Subject: Re: bzr workflow
Date: Tue, 12 Jan 2010 21:35:45 +0200

> Date: Tue, 12 Jan 2010 08:47:02 +0100
> From: Jan Djärv <address@hidden>
> Cc: address@hidden
> 
> To assume that one can always beforehand descide if one is about to do a 
> quickfix or not is also too simple minded.

You don't need to decide in advance.  Start in the trunk or in
quickfix, and if you later see that a separate branch is required,
then

   bzr branch trunk fix-something
   cd fix-something
   bzr merge ../trunk --uncommitted
   cd ../trunk
   bzr revert
   cd ../fix-something
   [and hack in the `fix-something' branch]

This copies uncommitted changes from trunk to a newly created branch,
then reverts the trunk to its previous pristine state, before you
started your not-so-simple fix.





reply via email to

[Prev in Thread] Current Thread [Next in Thread]