<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
On 11/30/2011 08:43 PM, Chris Hecker wrote:
<blockquote
cite="mid:CAOdMLc1+jQ7O5XBjX8o_8Da4AOEur=Mk+jgo3DZFEsdEAUqWtg@mail.gmail.com"
type="cite">
<blockquote style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px
solid rgb(204, 204, 204); padding-left: 1ex;"
class="gmail_quote">You merge to the branch that tracks "trunk"
(a.k.a. "mainline"), and<br>
then push from that.<br>
</blockquote>
<br>
Ah, okay, I figured you had to push somewhere!<br>
<br>
So, I have a bunch of repo's I'd like to switch to
append-only...what's the right way to do that?<br>
<br>
</blockquote>
"bzr init" has a --append-revisions-only option, which will enable
this for new branches you create.<br>
<br>
You can also set it on existing branches, either by using "bzr
config", or by manually editing .bzr/branch/branch.conf:<br>
<br>
$ bzr config append_revisions_only=True<br>
<br>
or<br>
<br>
$ echo append_revisions_only=True >> .bzr/branch/branch.conf<br>
<br>
Cheers,<br>
<br>
Jelmer<br>
<br>
<blockquote
cite="mid:CAOdMLc1+jQ7O5XBjX8o_8Da4AOEur=Mk+jgo3DZFEsdEAUqWtg@mail.gmail.com"
type="cite">
<div class="gmail_quote">On Wed, Nov 30, 2011 at 3:56 AM, Eli
Zaretskii <span dir="ltr"><<a moz-do-not-send="true"
href="mailto:eliz@gnu.org">eliz@gnu.org</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt
0.8ex; border-left: 1px solid rgb(204, 204, 204);
padding-left: 1ex;">
> Date: Wed, 30 Nov 2011 00:52:42 -0800<br>
> From: Chris Hecker <<a moz-do-not-send="true"
href="mailto:checker@d6.com">checker@d6.com</a>><br>
<div class="im">><br>
><br>
> > This option is set in the Emacs repository, so
"bzr push" from a<br>
> > branch will fail, IIUC.<br>
><br>
> So how to you push changes up "correctly" to an
append-revisions repo,<br>
> with merge and -d?<br>
<br>
</div>
You merge to the branch that tracks "trunk" (a.k.a.
"mainline"), and<br>
then push from that.<br>
<br>
You can either use "merge -d" for that or cd to the trunk
directory<br>
and say "merge ../branch". (FWIW, I use the latter, as it
suits<br>
better my mental model, and also doesn't require me to know
there is<br>
the -d switch ;-)<br>
<br>
</blockquote>
</div>
<br>
</blockquote>
<br>
</body>
</html>