Re: bzr repository ready?

[David De La Harpe Golden <david@harpegolden.net>]

Karl Fogel wrote:

> I may misunderstand the question, but I think this will help you:
>

Thanks, it's also possible I'm just too confused/tired/dumb to ask
a clear question.

>   * 'bzr push --remember DEST means the next time you can just do
>     'bzr push' and it will push to that same DEST.
> 

But not also decide to pull from DEST, right? i.e. it
push and pull's --remembers are independent?

>   * Suppose you have local branch LB, related to (originally branched
>     from) upstream branch UB.    After you send changes from LB to UB, you
>     can pull from UB to LB and, of course, it won't send those changes,
>     because LB already has them.  It will send changes LB doesn't have.
> 

That's the thing - Are you skipping a step here? At least, you've
got no _manifest_ local mirror of UB. I suppose the data's basically 
there underneath.  Why aren't I implicitly or explicitly making a local 
remote-tracking branch RB mirroring UB, then local branch LB ?  Or 
alternatively, if LB is the local mirror of UB, why am I sending changes 
from it - Why am I changing it in the first place? See below.

> The question of who is "remote" and who is not depends on point of
> view. 

Well, exactly, hence remote-tracking branches.

 > See
 > the oft-referred-to http://www.emacswiki.org/emacs/BzrForEmacsDevs.

*** Well, see, that strongly suggests to me the local branch "trunk" 
_is_ the bzr analog of remote-tracking branch:

"""Now, create a branch called trunk that will just be a mirror of the 
mainline. You’ll never do any development in this branch; its job is 
just to reflect the upstream master:"""

"""The --no-tree option prevents an automatic checkout of the source 
tree. This has two functions. It saves some space. More important, it 
reduces the temptation to edit sources in this branch to almost nothing 
— so that you don’t accidentally commit any local changes on it."""

*** Except for the bit where someone ...commits local changes on it... 
Wait, what?

Fortunately, I'm not an upstream committer, I'll presumably be sending 
or asking upstream committers to pick stuff from my public tree, but 
still, I'm clearly missing something.

"""Alternatively, if you are a committer, you may want to push to the 
upstream master.

       cd $DEVHOME/emacs/trunk/
       bzr pull
       bzr merge ../quickfixes

and then commit

       bzr commit -m "Merge: fix bla bla bla (closes Bug #1)."
which automatically pushes all your new commits to the upstream master, 
because the mirror is set up as bound branch.
"""

*** why is this happening on branch trunk and not a branch
my-trunk branched from trunk?  Can it, say, happen on such a branch 
my-trunk (not quickfixes, given dire warnings about history messing up 
if you do that) without ill effect, just to stop my brain hurting? Or
is that just as apparently bad as pushing from quickfixes would be?