Re: bzr handholding: restoring deleted file

[Juanma Barranquero]

On Fri, Jan 8, 2010 at 05:59, Jason Rumney <address@hidden> wrote:

> cd emacs/trunk
> bzr update
> cd ../quickfixes
> bzr commit
> bzr merge
> ... resolve conflicts
> bzr commit
> ... continue working

You could use shelve/unshelve and at least not be forced to commit
your changes before merging the trunk.

> Compared with the CVS case:
> cvs update
> ...resolve conflicts
> ...continue working

Well, if your change is really a quickfix, you can do it on the trunk,
and then the same workflow will apply:

  cd emacs/trunk
  ...hack hack hack
  bzr update
  ...resolve conflicts
  bzr commit -m "My quick fix"

though of course that is not recommended if the quickfix is
susceptible of turning into a slowfix with multiple commits.

    Juanma