all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Stephen J. Turnbull" <stephen@xemacs.org>
To: Karl Fogel <kfogel@red-bean.com>
Cc: "Óscar Fuentes" <ofv@wanadoo.es>,
	"Juanma Barranquero" <lekktu@gmail.com>,
	"Jan Djärv" <jan.h.d@swipnet.se>,
	emacs-devel@gnu.org
Subject: Re: bzr workflow
Date: Wed, 13 Jan 2010 13:02:37 +0900	[thread overview]
Message-ID: <877hrm3b4y.fsf@uwakimon.sk.tsukuba.ac.jp> (raw)
In-Reply-To: <87r5puspr5.fsf@red-bean.com>

Karl Fogel writes:

 > But at this point, I think we could update the BzrForEmacsDevs doc to
 > recommend just doing trivial mods in trunk and committing directly from
 > there.  Heck, that's what I'm doing with really simple stuff.
 > 
 > Can anyone think of any gotchas?  Particularly gotchas that would lead
 > to people on this list having to provide more support not less? :-)

No.  I just really dislike that workflow, personally.  (I accumulate
typo fixes and the like separately -- what's the rush? -- and don't
trust even the simplest code change to be correct without testing, at
least a compile, link, re-byte-compile, run test suite -- so my
quickfixes are batched, too.)  But that's a personal bias that I was
aware of, and I hope I mostly accounted for.

What consciously bothered me was experience with Mercurial.  In
Mercurial, commit-to-trunk leads to a very confusing DAG as myriads of
no-see-um branches get created, often in parallel, then very quickly
merged.  Unfortunately, they are very visible in the logs and in the
hgk DAG viewer (they're called "merge turds", which is quite apt), and
make use of hg diff confusing, too.

But in Bazaar with trunk bound to the public repo, that won't happen.
I didn't realize how powerful that technique would be.  I still don't
like it myself, but now I have convinced myself that it won't cause
any issues for other developers.  So I do not oppose including it
in BzrForEmacsDevs.




  reply	other threads:[~2010-01-13  4:02 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-11 21:10 bzr workflow Sam Steingold
2010-01-11 21:35 ` Andreas Schwab
2010-01-11 21:57   ` Sam Steingold
2010-01-11 23:05     ` Andreas Schwab
2010-01-11 21:37 ` Óscar Fuentes
2010-01-11 22:13   ` Chong Yidong
2010-01-12  7:47   ` Jan Djärv
2010-01-12  8:40     ` Óscar Fuentes
2010-01-12  9:39       ` Jan Djärv
2010-01-12  9:48         ` Óscar Fuentes
2010-01-12 19:41         ` Eli Zaretskii
2010-01-13  7:24           ` Jan D.
2010-01-13  0:01         ` Juanma Barranquero
2010-01-13  2:18           ` Stephen J. Turnbull
2010-01-13  2:16             ` Juanma Barranquero
2010-01-13  3:23               ` Stephen J. Turnbull
2010-01-13  3:29                 ` Lennart Borgman
2010-01-13  4:18                   ` Eli Zaretskii
2010-01-13  4:56                     ` Lennart Borgman
2010-01-13  8:48                       ` Stephen J. Turnbull
2010-01-13  3:53                 ` Juanma Barranquero
2010-01-13  2:27             ` Karl Fogel
2010-01-13  4:02               ` Stephen J. Turnbull [this message]
2010-01-13  4:20                 ` Eli Zaretskii
2010-01-13 16:55                 ` Karl Fogel
2010-01-13  4:17               ` Eli Zaretskii
2010-01-13  8:31               ` Óscar Fuentes
2010-01-12 19:35     ` Eli Zaretskii
2010-01-11 22:08 ` Eli Zaretskii

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=877hrm3b4y.fsf@uwakimon.sk.tsukuba.ac.jp \
    --to=stephen@xemacs.org \
    --cc=emacs-devel@gnu.org \
    --cc=jan.h.d@swipnet.se \
    --cc=kfogel@red-bean.com \
    --cc=lekktu@gmail.com \
    --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.