all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: "Óscar Fuentes" <ofv@wanadoo.es>
Cc: emacs-devel@gnu.org
Subject: Re: New branch
Date: Thu, 28 Jan 2010 17:53:46 -0500	[thread overview]
Message-ID: <jwv8wbhn8tq.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87aavyt3u1.fsf@telefonica.net> ("Óscar Fuentes"'s message of "Thu, 28 Jan 2010 20:41:10 +0100")

> ... for the people that at that time have branches of `trunk' and
> `pending', if they do not adjust their reference branches to match the
> change, they can get confused: the lesser problem is the disappearance
> of `pending', which it is just an annoyance, but `trunk' suddendly
> taking the role of the former `pending' branch can be a bit disturbing,
> as you are switching roles, and if someone does not notice it, he can
> commit to the "new" `trunk' something intended for the "old" trunk.

trunk wouldn't take the role of the pending branch: it would take the
content of the pending branch but keep its role of "where development is
focused", so I don't think there's any problem.  It matches previous CVS
pratice in this regard.

> In the future, I suggest creating branches with a name that conveys its
> purpose (trunk can be the perennial development branch, then we would
> have `emacs-XX.X', etc) and keep those names forever. This requires
> almost no housekeeping on the developers part, except for cloning
> emacs-XX.X when it is created, which is much simpler than adjusting
> branch references.

When I tried to do that, I bumped into the problem that I can't have
a symlink "trunk" pointing to the "emacs-23" branch (because
bzr.sv.gnu.org's http server doesn't honor symlinks).


        Stefan




  parent reply	other threads:[~2010-01-28 22:53 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-28  2:37 New branch Stefan Monnier
2010-01-28  5:40 ` Eli Zaretskii
2010-01-28 19:13   ` Stefan Monnier
2010-01-28 19:41     ` Óscar Fuentes
2010-01-28 20:12       ` Chong Yidong
2010-01-28 21:08         ` Eli Zaretskii
2010-01-28 22:53       ` Stefan Monnier [this message]
2010-01-28 23:22         ` Óscar Fuentes
2010-01-29  1:55           ` Stefan Monnier
2010-01-29  4:24     ` Stephen J. Turnbull
2010-01-29  5:13       ` Stefan Monnier
2010-02-03  1:05 ` Kenichi Handa
2010-02-03  2:31   ` Stefan Monnier
2010-02-03  4:24     ` Kenichi Handa
2010-02-03 14:20       ` Stefan Monnier

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=jwv8wbhn8tq.fsf-monnier+emacs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=emacs-devel@gnu.org \
    --cc=ofv@wanadoo.es \
    /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.