Re: bzr handholding: restoring deleted file

[Eli Zaretskii]

> From: Juanma Barranquero <address@hidden>
> Date: Fri, 8 Jan 2010 11:42:30 +0100
> Cc: Glenn Morris <address@hidden>, address@hidden, address@hidden
> 
> On Fri, Jan 8, 2010 at 10:24, Eli Zaretskii <address@hidden> wrote:
> 
> > 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.
> 
> After
> 
>   cd trunk
>   bzr merge --uncommitted ../my-branch
> 
> the trunk's tree will have the changes that were (and still are) in
> my-branch's tree. It's a way to copy uncommitted changes between
> trees, instead of the normal merge, which copies committed changes
> between branches.

So it's a way of merging with modified files from the named branch,
without naming those files explicitly?