[ANN][RFC] plugin package: ezbzr
Jan Hudec
bulb at ucw.cz
Fri Jan 20 06:26:03 GMT 2006
On Thu, Jan 19, 2006 at 08:19:27 -0500, Nathaniel McCallum wrote:
> On Thu, 2006-01-19 at 08:44 +0100, 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
>
> Its not scary, its just basically a shortcut for:
> $ TEMP=`mktemp`
> $ cd $TEMP
> $ branch --basis=mybranch sftp://foo//bar
> $ cd bar
> $ bzr merge mybranch
> $ bzr commit "Merged into mainline"
This *IS* damn *MUCH* scary.
> $ bzr push
> $ cd $orig_dir
> $ rm -rf $TEMP
>
> If conflicts occur, the temp directory is left alone and instructions on
> how to proceed are printed on the screen.
Semantic conflicts may occur without syntactic ones ever appearing.
Especially since the push is likely to be to a public place, it is
absolutely necessary to run syntax check, unit test (if available) and
that human actually *reads* the diff before it is commited.
Yes, I have already seen such merge that did not declare a conflict, but
the result did not compile at all.
--
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/041b141b/attachment.pgp
More information about the bazaar
mailing list