From: Eli Zaretskii <eliz@gnu.org>
To: Glenn Morris <rgm@gnu.org>
Cc: maarons@gnu.org, emacs-devel@gnu.org
Subject: Re: bzr handholding: restoring deleted file
Date: Fri, 08 Jan 2010 11:24:46 +0200 [thread overview]
Message-ID: <83iqbdaqzl.fsf@gnu.org> (raw)
In-Reply-To: <19270.33137.43277.502551@fencepost.gnu.org>
> Date: Thu, 7 Jan 2010 19:50:57 -0500
> From: Glenn Morris <rgm@gnu.org>
> Cc: emacs-devel@gnu.org
>
>
> Marek Aaron Sapota wrote (on Thu, 7 Jan 2010 at 19:40 -0500):
>
> > Use bzr revert configure.
>
> What command can I type to get the equivalent functionality of
> `cvs update'? In other words, I want to:
>
> restore any and all deleted files, without me having to list the
> individual file names.
Does the following trick work?
bzr revert `bzr deleted`
> merge in any changes from the Emacs repository. If I have any local
> uncommitted changes (there will be no local commits in this case) in
> the relevant files, I want automatic merging, with conflict markers
> and a warning where necessary.
I think
bzr merge --force
is what you want. It may even restore the deleted files, but I didn't
try.
Btw, can anyone explain what does "merge --uncommitted" do? Its
description in the docs is cryptic:
--uncommitted Apply uncommitted changes from a working copy, instead
of branch changes.
Huh?
next prev parent reply other threads:[~2010-01-08 9:24 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 [this message]
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
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=83iqbdaqzl.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=maarons@gnu.org \
--cc=rgm@gnu.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 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).