From: Eli Zaretskii <eliz@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: Latest merge from the emacs-23 branch
Date: Sun, 19 Dec 2010 10:10:08 -0500 [thread overview]
Message-ID: <E1PUKtk-0006ov-Bw@fencepost.gnu.org> (raw)
In-Reply-To: <jwvhbe9sx58.fsf-monnier+emacs@gnu.org> (message from Stefan Monnier on Sun, 19 Dec 2010 08:47:18 -0500)
> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: emacs-devel@gnu.org
> Date: Sun, 19 Dec 2010 08:47:18 -0500
>
> In practice the list tends to be reasonably short (since it only
> includes things like backports plus a few changes that are already
> overridden on the trunk, like changing the release number). So we could
> probably include it, tho it's more work. Currently, the output that my
> script gets doesn't mention revision ids, only revision numbers and log
> messages, so maybe we could just include the first line of commit
> messages instead of revision ids.
That'd be good, thanks.
> > how can I distinguish between this case and the case of
> > erroneously merging from the branch (which happened in the past)?
>
> By looking at the code.
You mean, I need to give up using "bzr diff" (or the corresponding VC
commands), which AFAIK are based on the history metadata, and instead
use "bzr cat" on each one of two (or 3) revisions, then run Diff on
them? That'd be a major inconvenience.
> Even with more metadata, only the code can tell
> you what was actually changed since the metadata can only tell you what
> bzr commands were used (and even that only to a limited extent since my
> script uses various ways to cheat around bzr's limitations), but not how
> conflicts were resolved manually or what extra manual changes
> were performed.
If we cheat Bazaar too much, we will eventually cheat ourselves,
because output of a "cheated" tool cannot be trusted.
prev parent reply other threads:[~2010-12-19 15:10 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-17 16:03 Latest merge from the emacs-23 branch Eli Zaretskii
2010-12-17 18:19 ` Andreas Schwab
2010-12-17 19:22 ` Eli Zaretskii
2010-12-17 22:03 ` Stefan Monnier
2010-12-17 23:06 ` Eli Zaretskii
2010-12-18 15:58 ` Stefan Monnier
2010-12-18 17:37 ` Eli Zaretskii
2010-12-19 13:47 ` Stefan Monnier
2010-12-19 15:10 ` Eli Zaretskii [this message]
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=E1PUKtk-0006ov-Bw@fencepost.gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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.