Design goals of bazaar-ng

[Martin Pool]

On 18 May 2005, Erik B?gfors <zindar at gmail.com> wrote:

> I actually have a question regarding something that I asked you in Sydney.
> 
> In darcs, it's very convinient moving individual changes between
> branches.  You can do that and still keep history, logs, commiters
> etc.  If I remember correctly you said that you planed for something
> like that in bzr.  Is there any thought around this in bzr? I can't
> find it in any document.

Yes, this is called cherry-picking in the documents.  

darcs can do this very easily and nicely: you can move a change from
one tree into another, even if the patch is not an exact fit because
darcs will rewrite or reorder the patch to fit.  The price you pay for
this is that darcs does not maintain a precise history of the project,
which for bazaar-ng is a mandatory requirement.

In bazaar-ng the model for cherry picking is similar to that of Arch,
though we can have a better interface.  The process is:

 - pick the single change(s) you want to move in

 - merge them in; there may be textual or semantic conflicts which 
   need to be manually fixed up

 - record a new changeset which includes a record of the revision-id
   of the other changes which have been merged

So you can keep history, logs, committers, etc.  The record of
cherry-picked changes can be used in a gui or web interface as a
hyperlink to show where they came from, or to find what changes have
not yet been merged across.

-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050519/b104490d/attachment.pgp