Comment 4 for bug 800771

Revision history for this message
Vincent Ladeuil (vila) wrote :

> And one more question. If I have only local commits I should do "bzr update -r <rev_no>", right?

I don't think you want to use -r<revno> here, just do 'bzr update' and see bzr help update:

Purpose: Update a tree to have the latest code committed to its branch.
Usage: bzr update [DIR]

Options:
  -v, --verbose Display more information.
  -h, --help Show help message.
  -q, --quiet Only display errors and warnings.
  --usage Show usage message and options.
  --show-base Show base revision text in conflicts.
  -r ARG, --revision=ARG
                        See "help revisionspec" for details.

Description:
  This will perform a merge into the working tree, and may generate
  conflicts. If you have any local changes, you will still
  need to commit them after the update for the update to be complete.

  If you want to discard your local changes, you can just do a
  'bzr revert' instead of 'bzr commit' after the update.

  If you want to restore a file that has been removed locally, use
  'bzr revert' instead of 'bzr update'.

  If the tree's branch is bound to a master branch, it will also update
  the branch from the master.

Aliases: up
See also: pull, status-flags, working-trees