[ANN][RFC] plugin package: ezbzr

[Jan Hudec]

On Thu, Jan 19, 2006 at 12:29:07 -0500, Nathaniel McCallum wrote:
> On Thu, 2006-01-19 at 09:58 -0600, John A Meinel wrote:
> 
> > Looking at the internal comments, it seems to 'bzr get' a remote branch
> > locally, then merge the current tree into it, and then push the changes
> > back to the remote.
> > 
> > I suppose the idea is you might have sftp access, but not ssh access,
> > and you want to merge into the remote, not push.
> 
> This is exactly what it does.  It was written for (mainly) internal use
> where we need to have multiple shared repositories on a (secured) remote
> server, but we don't have shell access.  Each of these branches are
> related, but not identical.  Thus I may need to merge feature x from my
> branch into each of the following 'x' branches.  Is there another
> workflow I should be using?

The workflow is correct. But you should review the changes you are
pushing, so it should really be broken into two separate stages - the
merge and the commit+push.

I think it would be best to add an option to merge command, that would
do the merge as usual, but replace revision-history with the remote one
(like pull --overwrite) and put the local revision in pending-merges.
Then you'd normally commit and push.

The option could be '--switch-parents', but perhaps '--to' would be
better, considering it's to be used rather often.

-- 
						 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/ac38e832/attachment.pgp