bzr push after bzr branch

[Barry Warsaw]

On Jan 18, 2010, at 06:01 PM, Ian Clatworthy wrote:

>Barry Warsaw wrote:
>
>> I understand the argument that for code branches, the push location is usually
>> different than the pull location, but at least these days, those kind of
>> branches are the minority of what I'm working with.  Since I've now mostly
>> converted all my old homedir and system /etc files from Subversion to Bazaar,
>> I find myself branching them quite often.  In those cases, the push location
>> is exactly the parent.
>
>FWIW, I'm not a fan of pushing to the parent location as, imo, that's
>not the bzr way. Instead, I'd suggest either:
>
>* Using a bound branch so commits implicitly go to both locations.
>  That's idea for the local mirror (e.g. trunk) of a remote branch.
>
>* Merging from a local feature branch into your local trunk.
>  Unlike push, merge will not screw up the mainline history of the
>  branch being pushed to.
>
>I typically combine these, i.e. my trunk is nearly always a bound
>branch, I branch from it to create feature branches and I merge those
>back into the trunk.

Right, that's a great work flow for code branches, but doesn't make as much
sense for $HOME dot-file and /etc files.   Those branches are almost never
"branched-and-merged".  You just edit your files in place and then push them
to a remote location for safe keeping.  That push location is (so far IME)
always the same as the pull location.

Aside: I do occasionally branch those /etc files in a different location
(out-situ? :) so that I can more easily hack on the file or copy files across
from a different system.  This is made more difficult by some problems with
etckeeper that I haven't worked out yet.  E.g. if I try to commit from the
out-situ location, it seems that the etckeeper hooks still want to run, but
fail due to permission problems (I'm not root at that time).  I haven't spent
much time figuring this one out.  I usually just move the etckeeper file aside
temporarily.

-Barry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20100118/8a758c1c/attachment.pgp