From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: Glenn Morris <rgm@gnu.org>
Cc: Chong Yidong <cyd@stupidchicken.com>,
Katsumi Yamaoka <yamaoka@jpl.org>,
emacs-devel@gnu.org
Subject: Re: Emacs trunk
Date: Fri, 03 Dec 2010 17:50:38 -0500 [thread overview]
Message-ID: <jwvsjyemq1n.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <cmhbeu1p1r.fsf@fencepost.gnu.org> (Glenn Morris's message of "Fri, 03 Dec 2010 17:15:12 -0500")
>> He also gave them different file-ids. So we should re-remove them and
>> then re-add them with "bzr add --file-ids-from" some older branch.
>> Or maybe just with something like "bzr merge -r 102572..102571".
> Plain old `bzr revert -r LAST-GOOD-REV configure.in' _seems_ to work...
Could be that it works as well, but "bzr merge -r 102572..102571" is the
standard way to undo a commit (and before committing this undo, you can
of course edit as much as you want so as to only undo part of the
commit, or add new changes on top of the undo, ...). And it will show
you conflicts so you know where you need to check that you're not
accidentally undoing more than expected.
Stefan
next prev parent reply other threads:[~2010-12-03 22:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-03 15:30 Emacs trunk Katsumi Yamaoka
2010-12-03 18:32 ` Chong Yidong
2010-12-03 21:41 ` Glenn Morris
2010-12-03 22:16 ` Chong Yidong
2010-12-05 12:22 ` Katsumi Yamaoka
2010-12-03 22:07 ` Stefan Monnier
2010-12-03 22:15 ` Glenn Morris
2010-12-03 22:50 ` Stefan Monnier [this message]
2010-12-03 23:13 ` Glenn Morris
2010-12-04 1:22 ` Stefan Monnier
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=jwvsjyemq1n.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=cyd@stupidchicken.com \
--cc=emacs-devel@gnu.org \
--cc=rgm@gnu.org \
--cc=yamaoka@jpl.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 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.