Cherrypicking workflows with bzr

[Jan Hudec]

On Thu, Jan 19, 2006 at 10:16:32 -0600, John A Meinel wrote:
> Martin Pool wrote:
> > On 18 Jan 2006, John Arbash Meinel <john at arbash-meinel.com> wrote:
> 
> ...
> 
> >>> All help and comments appreciated.
> > 
> > What would work best with bzr at the moment is to in fact keep things
> > separate: as with paint it's easier to combine changes when you need
> > them combined than try to separate them later.  However sometimes it's
> > either not practical or you only realize after the fact what's needed,
> > so we will work on better cherrypicking.
> 
> Sure, feature branches are easier to work with. But considering bzr's
> the working directory is the branch, it can be a little bit more
> difficult to create a feature branch. You can't just 'baz branch' to a
> new archive branch, and then do some commits, and then 'baz switch' and
> 'baz merge' the features back in.
> 
> With repositories and bound branches, some of this might be reasonable.

Why? Merge with ability to switch would be enough.

> > I'm not sure, but I think Baz or Arch will get into the same situation
> > if you cherry-pick, sync-tree and then star-merge.  You can get away
> > with it if you keep on using replay or update.
> 
> I don't know about star-merge. Probably 'baz merge' would get the same
> problem. I think star-merge was sufficiently close to replay that it
> wouldn't over analyze the situation. (unless you used --three-way,
> star-merge just replays the patches).

Not really. It does the same 3-way merge either way, except that without
--tree-way it uses diff+patch as a 'poor man's merge'.

> But yes, 'bzr' has no concept of replay to fall back on to support his
> use case. I could see a 'replay' which could be as simple as 'merge, but
> force the base to be in the other tree'.

Well, there is probably going to be a replay, with proper cherry-picking
support. Bzr is just not there yet.

-- 
						 Jan 'Bulb' Hudec <bulb at ucw.cz>
-------------- 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/20060120/297bad4e/attachment.pgp