bzr pull vs. bzr update

Juanma Barranquero lekktu at gmail.com
Wed Dec 16 17:37:01 GMT 2009


The "Bzr For Emacs Developers" document at the Emacs Wiki
(http://www.emacswiki.org/emacs-en/BzrForEmacsDevs) describes a
recommended setup for Emacs developers after the switch to Bazaar.

The initial setup is as follows:

      cd $DEVHOME
      bzr init-repo --2a emacs/
      cd emacs/
      bzr branch
sftp://<membername>@bzr.savannah.gnu.org/srv/bzr/emacs/trunk trunk/
      cd trunk/
      echo "public_branch =
sftp://<membername>@bzr.savannah.gnu.org/srv/bzr/emacs/trunk" >>
.bzr/branch/branch.conf
      bzr bind sftp://<membername>@bzr.savannah.gnu.org/srv/bzr/emacs/trunk
      cd ..

and then creating additional task branches for actual bug-fixing and developing:

      cd $DEVHOME/emacs
      bzr branch trunk/ quickfixes/

etc.

IIUC, following these steps the trunk/ directory is a checkout, and
bzr info agrees:

    C:\...\trunk> bzr info
    Repository checkout (format: 2a)
    Location:
      repository checkout root: .
            checkout of branch:
sftp://lektu@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/
             shared repository: C:/emacs/repo

    Related branches:
      public branch: sftp://lektu@bzr.savannah.gnu.org/srv/bzr/emacs/trunk
      parent branch: sftp://lektu@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/

However, references to updating the trunk/ directory on
BzrForEmacsDevs always use "bzr pull" and not "bzr update", for
example:

      cd $DEVHOME/emacs/trunk/
      bzr pull
      bzr merge ../quickfixes
      bzr commit -m "Merge: fix bla bla bla (closes Bug #1)."



More information about the bazaar mailing list