From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: "Stephen J. Turnbull" <stephen@xemacs.org>
Cc: kbrown@cornell.edu, Juanma Barranquero <lekktu@gmail.com>,
cyd@stupidchicken.com, emacs-devel@gnu.org,
michael.albinus@gmx.de, Eli Zaretskii <eliz@gnu.org>
Subject: Re: Incorrect merge
Date: Tue, 02 Nov 2010 10:54:54 -0400 [thread overview]
Message-ID: <jwv8w1bpyk0.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87hbg0jxyu.fsf@uwakimon.sk.tsukuba.ac.jp> (Stephen J. Turnbull's message of "Tue, 02 Nov 2010 10:50:01 +0900")
>> > Suggestions are welcome.
>> I don't think there are magic bullets.
> In Python, they have a script called svnmerge.py. This script did
> many things, one of them was to keep track of blocked revisions, ie,
> revisions that should not be merged to trunk (or to some given branch,
> IIRC).
Indeed, the only way I can think of to try and make sure such undesired
merges don't happen is to try and encode this fact into a merge script.
Having such a merge script is a good idea in any case since it can help
resolve the ChangeLog conflicts as well (they tend to require a lot of
work, but most of it can be automated).
Stefan
next prev parent reply other threads:[~2010-11-02 14:54 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-01 13:48 Incorrect merge Ken Brown
2010-11-01 15:46 ` Chong Yidong
2010-11-01 16:02 ` Chong Yidong
2010-11-01 17:54 ` Eli Zaretskii
2010-11-01 20:21 ` Juanma Barranquero
2010-11-01 20:37 ` Eli Zaretskii
2010-11-01 22:19 ` Juanma Barranquero
2010-11-02 1:50 ` Stephen J. Turnbull
2010-11-02 14:54 ` Stefan Monnier [this message]
2010-11-02 15:57 ` Óscar Fuentes
2010-11-02 16:45 ` Stephen J. Turnbull
2010-11-02 17:14 ` Óscar Fuentes
2010-11-02 18:34 ` Stephen J. Turnbull
2010-11-02 18:56 ` Óscar Fuentes
2010-11-02 20:25 ` Stephen J. Turnbull
2010-11-02 20:44 ` Óscar Fuentes
2010-11-03 5:22 ` Stephen J. Turnbull
2010-11-03 6:46 ` Óscar Fuentes
2010-11-03 7:44 ` Stephen J. Turnbull
2010-11-03 13:51 ` Stefan Monnier
2010-11-04 20:16 ` Lars Magne Ingebrigtsen
2010-11-05 9:30 ` Andreas Schwab
2010-11-05 11:42 ` Eli Zaretskii
2010-11-08 16:03 ` Stefan Monnier
2010-11-03 6:52 ` Óscar Fuentes
2010-11-03 7:47 ` Stephen J. Turnbull
2010-11-02 17:22 ` Stefan Monnier
2010-11-02 17:37 ` Óscar Fuentes
2010-11-02 18:38 ` Eli Zaretskii
2010-11-02 19:19 ` Óscar Fuentes
2010-11-02 21:21 ` Stefan Monnier
2010-11-01 23:02 ` Óscar Fuentes
2010-11-02 1:29 ` Jason Rumney
2010-11-02 5:16 ` Óscar Fuentes
2010-11-02 9:16 ` Andreas Schwab
2010-11-02 14:17 ` Óscar Fuentes
2010-11-02 17:24 ` Stefan Monnier
2010-11-02 17:41 ` Óscar Fuentes
2010-11-02 17:44 ` Davis Herring
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwv8w1bpyk0.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=cyd@stupidchicken.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=kbrown@cornell.edu \
--cc=lekktu@gmail.com \
--cc=michael.albinus@gmx.de \
--cc=stephen@xemacs.org \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).