[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: bzr handholding: restoring deleted file
From: |
Eli Zaretskii |
Subject: |
Re: bzr handholding: restoring deleted file |
Date: |
Fri, 08 Jan 2010 11:24:46 +0200 |
> Date: Thu, 7 Jan 2010 19:50:57 -0500
> From: Glenn Morris <address@hidden>
> Cc: address@hidden
>
>
> 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?