From: Stefan Monnier <monnier@iro.umontreal.ca>
To: martin rudalics <rudalics@gmx.at>
Cc: emacs-devel@gnu.org
Subject: Re: some bzrmerge.el questions
Date: Mon, 17 Jan 2011 14:29:02 -0500 [thread overview]
Message-ID: <jwvmxmzqqj3.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <4D348332.4050207@gmx.at> (martin rudalics's message of "Mon, 17 Jan 2011 18:58:10 +0100")
>> Could you add a similar thing for changes in comments that only relate
>> to loaddef checksums? I think in such cases, it should not bother
>> merging the change.
> During recent bzr updates I got a number (~ 5) of conflicts wrt loaddef
> checksums. I simply ignored them via bzr revert. Was that the right
> way to deal with this problem?
AFAIK that's the right way: choose one of the 3 options (doesn't matter
which). Then run "make" which should update the autoloads and in turn
update the md5 checksums to the value they need to take (which can be
a 4th value rather than one of the three from the conflict).
Stefan
next prev parent reply other threads:[~2011-01-17 19:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-13 20:29 some bzrmerge.el questions Glenn Morris
2011-01-13 21:43 ` Stefan Monnier
2011-01-14 7:12 ` Glenn Morris
2011-01-14 8:19 ` Glenn Morris
2011-01-14 17:30 ` Eli Zaretskii
2011-01-14 17:44 ` Glenn Morris
2011-01-14 19:00 ` Glenn Morris
2011-01-14 17:48 ` Glenn Morris
2011-01-14 18:39 ` Stefan Monnier
2011-01-15 20:44 ` Glenn Morris
2011-01-16 4:30 ` Stefan Monnier
2011-01-17 17:58 ` martin rudalics
2011-01-17 19:29 ` Stefan Monnier [this message]
2011-01-18 3:04 ` Glenn Morris
2011-01-18 15:12 ` Stefan Monnier
2011-01-18 18:30 ` Glenn Morris
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=jwvmxmzqqj3.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=rudalics@gmx.at \
/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).