From: Andreas Schwab <schwab@linux-m68k.org>
To: "Óscar Fuentes" <ofv@wanadoo.es>
Cc: emacs-devel@gnu.org
Subject: Re: Confusing "bzr log" as result of merges
Date: Sat, 21 May 2011 19:52:42 +0200 [thread overview]
Message-ID: <m2y620kkk5.fsf@igel.home> (raw)
In-Reply-To: <871uzs2cp7.fsf@wanadoo.es> ("Óscar Fuentes"'s message of "Sat, 21 May 2011 19:19:48 +0200")
Óscar Fuentes <ofv@wanadoo.es> writes:
> One thing fundamentally wrong with the current practice is that emacs-23
> ends with a mostly clean VC history while trunk accumulates all the mess
> created by cherry-picks.
Those few cherry-picks are nothing compared to the massive merge mess.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2011-05-21 17:52 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-21 7:33 Confusing "bzr log" as result of merges Eli Zaretskii
2011-05-21 8:36 ` Andreas Schwab
2011-05-21 8:44 ` Eli Zaretskii
2011-05-21 8:48 ` Eli Zaretskii
2011-05-21 9:01 ` Sven Joachim
2011-05-21 9:16 ` Eli Zaretskii
2011-05-21 9:27 ` Sven Joachim
2011-05-21 9:30 ` Eli Zaretskii
2011-05-21 10:27 ` Sven Joachim
2011-05-21 9:02 ` Andreas Schwab
2011-05-21 9:20 ` Eli Zaretskii
2011-05-21 9:38 ` Andreas Schwab
2011-05-21 10:33 ` Eli Zaretskii
2011-05-21 10:54 ` Andreas Schwab
2011-05-21 10:38 ` Eli Zaretskii
2011-05-21 10:56 ` Andreas Schwab
2011-05-21 11:27 ` Eli Zaretskii
2011-05-21 12:23 ` Andreas Schwab
2011-05-21 12:28 ` Eli Zaretskii
2011-05-21 10:57 ` Sven Joachim
2011-05-21 13:04 ` Eli Zaretskii
2011-05-21 13:37 ` Andreas Schwab
2011-05-21 14:46 ` Eli Zaretskii
2011-05-21 15:18 ` Andreas Schwab
2011-05-21 15:51 ` Eli Zaretskii
2011-05-21 16:39 ` Andreas Schwab
2011-05-21 16:21 ` Óscar Fuentes
2011-05-21 16:42 ` Andreas Schwab
2011-05-21 17:00 ` Óscar Fuentes
2011-05-21 17:06 ` Andreas Schwab
2011-05-21 17:19 ` Óscar Fuentes
2011-05-21 17:52 ` Andreas Schwab [this message]
2011-05-22 11:33 ` Juanma Barranquero
2011-05-21 16:48 ` Eli Zaretskii
2011-05-21 17:09 ` Óscar Fuentes
2011-05-21 18:56 ` Eli Zaretskii
2011-05-21 17:27 ` Glenn Morris
2011-05-21 19:02 ` Eli Zaretskii
2011-05-22 1:46 ` Glenn Morris
2011-05-22 14:14 ` Stefan Monnier
2011-05-22 17:28 ` Eli Zaretskii
2011-05-22 19:15 ` Stefan Monnier
2011-05-23 3:01 ` Eli Zaretskii
2011-05-23 12:02 ` Stefan Monnier
2011-05-23 12:58 ` 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=m2y620kkk5.fsf@igel.home \
--to=schwab@linux-m68k.org \
--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.