From: Kevin Ryde <user42@zip.com.au>
To: Neil Jerram <neil@ossau.uklinux.net>
Cc: guile-devel@gnu.org
Subject: Re: another merge from 1.8
Date: Tue, 30 Jan 2007 11:34:59 +1100 [thread overview]
Message-ID: <87ac018i8c.fsf@zip.com.au> (raw)
In-Reply-To: <87tzybxedx.fsf@ossau.uklinux.net> (Neil Jerram's message of "Sun, 28 Jan 2007 17:14:18 +0000")
Neil Jerram <neil@ossau.uklinux.net> writes:
>
> One detail of the merging... I gather we're preferring to merge
> ChangeLog fragments directly, so as to minimize the diffs between the
> ChangeLogs in two branches,
Yep.
> This seems fine to me, but it does mean we lose info about when the
> change was actually added to the target branch.
Shouldn't matter, usually, hopefully.
> (Merged from CVS HEAD on 2007-01-28.)
Sounds fine for a back-merge like this (I wouldn't see a need in a
forward merge though).
> I also had to specify a new encoding for the 1.8 ChangeLogs,
Is that when you let emacs do a merge or update? The same happened to
me and it offered some strange diffs. Ludovic put the right local
var, but I suspect emacs doesn't look at it on the first C-x v v that
brings it into the working copy.
_______________________________________________
Guile-devel mailing list
Guile-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/guile-devel
next prev parent reply other threads:[~2007-01-30 0:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-16 0:05 another merge from 1.8 Kevin Ryde
2007-01-16 12:13 ` Ludovic Courtès
2007-01-17 23:03 ` Neil Jerram
2007-01-18 23:18 ` Kevin Ryde
2007-01-28 17:14 ` Neil Jerram
2007-01-30 0:34 ` Kevin Ryde [this message]
2007-02-06 22:57 ` Neil Jerram
2007-02-07 23:12 ` Kevin Ryde
2007-02-18 23:36 ` Neil Jerram
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/guile/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ac018i8c.fsf@zip.com.au \
--to=user42@zip.com.au \
--cc=guile-devel@gnu.org \
--cc=neil@ossau.uklinux.net \
/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.
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).