From: Glenn Morris <rgm@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: some bzrmerge.el questions
Date: Mon, 17 Jan 2011 22:04:24 -0500 [thread overview]
Message-ID: <bityh6kj47.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <jwvmxmzqqj3.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Mon\, 17 Jan 2011 14\:29\:02 -0500")
I realize I am confused by "skipping". Naively, I thought skipping
would exclude the relevant revision entirely. However, a comment in
bzrmerge-apply says that it still merges the meta-data. I guess this
explains why revno: 99634.2.749 "!!!DO NOT MERGE TO THE TRUNK!!!" [1]
now shows up in `bzr log -n0' output on the trunk, even though I said
it should be skipped. Isn't it confusing to not merge the data, but
still merge the meta-data?
[1] A less hysterical "Do not merge to trunk" would have worked just
as well, BTW. (Though I admit I could have messed this up, because the
following commit changed the same code, but was not marked "do not
merge".)
next prev parent reply other threads:[~2011-01-18 3:04 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
2011-01-18 3:04 ` Glenn Morris [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bityh6kj47.fsf@fencepost.gnu.org \
--to=rgm@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.