[ANN][RFC] plugin package: ezbzr

[John A Meinel]

Jan Hudec wrote:
> On Thu, Jan 19, 2006 at 09:58:46 -0600, John A Meinel wrote:
>> Jan Hudec wrote:
>>> On Wed, Jan 18, 2006 at 13:43:46 -0500, Nathaniel McCallum wrote:
>>>>   3. release (new) -- Merges local branch into remote branches
>>> How does this work? From the description it sounds scary.
>>>
>>> Basically I don't see what you could do other than:
>>> local-branch$ bzr merge remote-branch
>>> (there should be a --reverse-parents option here, so the remote parent
>>>  is recorded as first one)
>>> local-branch$ bzr commit -m 'Merging into mainline'
>>> local-branch$ bzr push remote-branch
>>>
>> 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.
> 
> But I do NOT want the darn thing to even think about commiting
> unreviewed merge result. IMNSHO merge and commit should never be done
> without user interaction in between.
> 
> That's why I suggest the 'merge --reverse-parents' -- that would merge
> on local, but would record the parents in order remote, local, so the
> commited revision would look exactly as if created on the remote end,
> except it would be created on the local branch. It's like recording the
> revision id, pull --overwrite and then merge the recorded id.
> 

I think that is a nice workflow.
John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060119/c78464b2/attachment.pgp