From: Eli Zaretskii <eliz@gnu.org>
To: Stefan Monnier <monnier@IRO.UMontreal.CA>
Cc: maarons@gnu.org, emacs-devel@gnu.org
Subject: Re: bzr handholding: restoring deleted file
Date: Fri, 08 Jan 2010 21:29:13 +0200 [thread overview]
Message-ID: <83my0o9z06.fsf@gnu.org> (raw)
In-Reply-To: <jwvwrzsebxn.fsf-monnier+emacs@gnu.org>
> From: Stefan Monnier <monnier@IRO.UMontreal.CA>
> Cc: Glenn Morris <rgm@gnu.org>, maarons@gnu.org, emacs-devel@gnu.org
> Date: Fri, 08 Jan 2010 12:37:33 -0500
>
> > I think
> > bzr merge --force
> > is what you want.
>
> BTW, I recommend people stay away from it, not because it's inherently
> nasty, but because it's poorly supported (because Bzr developpers don't
> consider it an important case to handle well).
If it indeed does what Glenn wanted, he will have hard time staying
away from it ;-)
next prev parent reply other threads:[~2010-01-08 19:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-08 0:21 bzr handholding: restoring deleted file Glenn Morris
2010-01-08 0:45 ` Dan Nicolaescu
2010-01-08 0:51 ` Glenn Morris
2010-01-08 0:54 ` Dan Nicolaescu
2010-01-08 1:11 ` Jason Earl
[not found] ` <20100108004050.GB1426@fencepost.localnet>
2010-01-08 0:50 ` Glenn Morris
2010-01-08 4:59 ` Jason Rumney
2010-01-08 10:38 ` Juanma Barranquero
2010-01-08 9:24 ` Eli Zaretskii
2010-01-08 10:42 ` Juanma Barranquero
2010-01-08 12:31 ` Eli Zaretskii
2010-01-08 13:09 ` Juanma Barranquero
2010-01-08 17:37 ` Stefan Monnier
2010-01-08 19:29 ` Eli Zaretskii [this message]
2010-01-08 21:15 ` 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=83my0o9z06.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=maarons@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 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).