Re: bzr handholding: restoring deleted file

[Glenn Morris]

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.

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.