From: Eli Zaretskii <eliz@gnu.org>
To: kfogel@red-bean.com, emacs-devel@gnu.org
Subject: Re: Strange message from "bzr pull"
Date: Wed, 30 Dec 2009 02:02:26 -0500 [thread overview]
Message-ID: <E1NPsZe-0003DO-8A@fencepost.gnu.org> (raw)
In-Reply-To: <83d41xee5d.fsf@gnu.org> (message from Eli Zaretskii on Tue, 29 Dec 2009 22:09:02 +0200)
> Date: Tue, 29 Dec 2009 22:09:02 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: lekktu@gmail.com, emacs-devel@gnu.org
> Reply-To: Eli Zaretskii <eliz@gnu.org>
>
> > From: Karl Fogel <kfogel@red-bean.com>
> > Cc: lekktu@gmail.com, emacs-devel@gnu.org
> > Date: Tue, 29 Dec 2009 14:09:43 -0500
> >
> > >OK. So, since we have this tree in trunk/, what are the reasons to
> > >keep it pristine, again? IOW, why not make quick and simple fixes in
> > >it directly, instead of in another branch?
> >
> > I *think* that would work fine (though I'm not 100% positive, since I
> > don't do it myself).
> >
> > The only reason I didn't document that is that if upstream gets new
> > changes while the local edits are being made, then one would have to
> > pull them in before committing -- because, as a bound branch, trunk is
> > not supposed to diverge from what it's bound to. But they might
> > conflict. Now your local trunk mirror is in a conflicted state.
>
> Yes, understood. But I didn't intend to make any serious changes
> there, just the ``one-offs''. If only one or two files are modified,
> things will not become too ugly, I think, even if there are conflicts.
So what, if any, changes in the bzr configuration and in the workflow
documented on the wiki would be necessary if the trunk/ tree is used
for small one-off fixes?
I understand that by binding this branch to the remote repository, we
actually made it a checkout. Therefore, "bzr pull" that is documented
on the wiki will only work if I have no local changes that are not
committed to the central repository; otherwise, I need to use "bzr update",
is that right? If so, perhaps it's better to say on the wiki that
"bzr update" be always used in trunk/, because it will always work, no
matter if the mirror diverged or not?
Next, what is this public_branch directive in .bzr/branch/branch.conf.
Its documentation in the manual is abysmally inadequate, but it sounds
like it is only used in "bzr send"? If so, making changes in trunk/
does not need to change this (or any other) line in branch.conf, is
that right?
Any other consequences I missed?
TIA
next prev parent reply other threads:[~2009-12-30 7:02 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-29 7:43 Strange message from "bzr pull" Eli Zaretskii
2009-12-29 10:18 ` Juanma Barranquero
2009-12-29 10:30 ` Eli Zaretskii
2009-12-29 12:40 ` Juanma Barranquero
2009-12-29 16:24 ` Eli Zaretskii
2009-12-29 17:00 ` Karl Fogel
2009-12-29 18:10 ` Eli Zaretskii
2009-12-29 18:13 ` Juanma Barranquero
2009-12-29 18:34 ` Eli Zaretskii
2009-12-29 19:28 ` Óscar Fuentes
2009-12-29 19:51 ` Karl Fogel
2009-12-29 20:04 ` Óscar Fuentes
2009-12-29 20:15 ` Karl Fogel
2009-12-29 20:29 ` Eli Zaretskii
2009-12-29 23:32 ` Óscar Fuentes
2009-12-30 4:16 ` Eli Zaretskii
2009-12-30 5:15 ` Óscar Fuentes
2009-12-31 9:39 ` Stephen J. Turnbull
2009-12-29 20:16 ` Eli Zaretskii
2009-12-29 23:14 ` Óscar Fuentes
2009-12-30 4:21 ` Eli Zaretskii
2009-12-30 4:28 ` Miles Bader
2009-12-30 5:26 ` Óscar Fuentes
2009-12-29 18:44 ` Karl Fogel
2009-12-29 19:01 ` Eli Zaretskii
2009-12-29 19:09 ` Karl Fogel
2009-12-29 20:09 ` Eli Zaretskii
2009-12-30 7:02 ` Eli Zaretskii [this message]
2009-12-30 12:19 ` Juanma Barranquero
2009-12-30 15:05 ` Eli Zaretskii
2009-12-30 15:19 ` Juanma Barranquero
2009-12-31 19:36 ` Karl Fogel
2009-12-31 20:49 ` Juanma Barranquero
2009-12-29 21:37 ` Stefan Monnier
2009-12-31 9:43 ` Stephen J. Turnbull
2009-12-29 18:02 ` Eli Zaretskii
2009-12-29 18:12 ` Juanma Barranquero
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1NPsZe-0003DO-8A@fencepost.gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=kfogel@red-bean.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.