Immediate merge of a bundle vs branch -r + pull and later merge
Matthew D. Fuller
fullermd at over-yonder.net
Tue Aug 21 06:14:33 BST 2007
On Tue, Aug 21, 2007 at 03:06:03PM +1000 I heard the voice of
Andrew Cowie, and lo! it spake thus:
>
> (2)
> $ tail ~/Desktop/whatever.bundle
> [manually extract base revid from last few lines]
> $ cd ..
> $ bzr clone -r revid:andrew at oper...34f6a0b mainline whatever
> $ cd whatever
> $ bzr pull ~/Desktop/whatever.bundle
>
> Whew. That was a lot of work.
A rather easier way would be:
$ bzr branch mainline whatever
$ cd whatever
$ bzr pull --overwrite ~/Desktop/whatever.bundle
(insert obvious warnings about doing pull --overwrite from the wrong
dir, but hey, what's life without a little thrill? ;)
--
Matthew Fuller (MF4839) | fullermd at over-yonder.net
Systems/Network Administrator | http://www.over-yonder.net/~fullermd/
On the Internet, nobody can hear you scream.
More information about the bazaar
mailing list