update branch at rev 2229

[Richard Wilbur]

structure:
  repository bzr
    branch bzr.dev (no changes, intended to track main dev tree,
                    parent branch http://bazaar-vcs.org/bzr/bzr.dev/)
      branch giveback (changes committed 17 Oct 2006,
                       parent branch bzr.dev)

I am using bzr from Ubuntu Hardy Heron 8.04.2 (LTS).
$ /usr/bin/bzr --version
Bazaar (bzr) 1.3.1
  Python interpreter: /usr/bin/python 2.5.2.final.0
  Python standard library: /usr/lib/python2.5
  bzrlib: /usr/lib/python2.5/site-packages/bzrlib
  Bazaar configuration: /home/rwilbur/.bazaar
  Bazaar log file: /home/rwilbur/.bzr.log

Copyright 2005, 2006, 2007, 2008 Canonical Ltd.
http://bazaar-vcs.org/


My steps in trying to bring my local bzr branches up to current trunk:
1.  upgraded the branch storage on both branches with
cd ~/bzr; /usr/bin/bzr upgrade bzr.dev; /usr/bin/bzr upgrade giveback
2.  updated the branch with committed changes using
/usr/bin/bzr update giveback
3.  resolved merge conflicts manually and verified that test cases were
updated and passed
cd giveback; /usr/bin/bzr resolve
4.  committed merge resolution
/usr/bin/bzr commit -m 'Merge from trunk.'

Now I am ready to try and get the rest of the changes but 'bzr update'
claims both branches are up-to-date and 'bzr pull bzr.dev' claims it
can't understand the branch format from bazaar-vcs.org.  How would you
suggest I bring my branches up-to-date?

Sincerely,

Richard Wilbur

----------------------------------------------------------------------
Bzr info and output

rwilbur at transform:~/bzr/giveback$ /usr/bin/bzr version-info
revision-id: richard.wilbur at gmail.com-20090528154043-z7f960f0459c984f
date: 2009-05-28 09:40:43 -0600
build-date: 2009-06-16 14:00:19 -0700
revno: 2075
branch-nick: giveback
rwilbur at transform:~/bzr/giveback$ /usr/bin/bzr branch-history
Martin Pool <mbp at sourcefrog.net>
  1 .. 1389
Robert Collins <robertc at robertcollins.net> / integration
  1390 .. 1534
Martin Pool <mbp at sourcefrog.net> / bzr.dev (Main development branch)
  1535 .. 1546
Martin Pool <mbp at sourcefrog.net> / bzr.mbp.fileid-involved
  1547
Martin Pool <mbp at sourcefrog.net> / bzr.dev (Main development branch)
  1548 .. 1553
Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com> / +trunk
  1554 .. 2071
Richard Wilbur <richard.wilbur at gmail.com> / giveback
  2072 .. 2075
rwilbur at transform:~/bzr/giveback$ cd ../bzr.dev
rwilbur at transform:~/bzr/bzr.dev$ /usr/bin/bzr branch-history
Martin Pool <mbp at sourcefrog.net>
  1 .. 1389
Robert Collins <robertc at robertcollins.net> / integration
  1390 .. 1534
Martin Pool <mbp at sourcefrog.net> / bzr.dev (Main development branch)
  1535 .. 1546
Martin Pool <mbp at sourcefrog.net> / bzr.mbp.fileid-involved
  1547
Martin Pool <mbp at sourcefrog.net> / bzr.dev (Main development branch)
  1548 .. 1553
Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com> / +trunk
  1554 .. 2229
rwilbur at transform:~/bzr/bzr.dev$ cd -
/home/rwilbur/bzr/giveback
rwilbur at transform:~/bzr/giveback$ bzr update
bzr: ERROR: Unknown branch format: 'Bazaar Working Tree Format 4 (bzr
0.15)\n'
rwilbur at transform:~/bzr/giveback$ /usr/bin/bzr update
Tree is up to date at revision 2075.
rwilbur at transform:~/bzr/giveback$ /usr/bin/bzr info
Repository tree (format: dirstate-tags)
Location:
  shared repository: /home/rwilbur/bzr
  repository branch: .

Related branches:
    push branch: 
  parent branch: /home/rwilbur/bzr/bzr.dev
rwilbur at transform:~/bzr/giveback$ cd -
/home/rwilbur/bzr/bzr.dev
rwilbur at transform:~/bzr/bzr.dev$ /usr/bin/bzr update
Tree is up to date at revision 2229.
rwilbur at transform:~/bzr/bzr.dev$ /usr/bin/bzr info
Repository tree (format: dirstate-tags)
Location:
  shared repository: /home/rwilbur/bzr
  repository branch: .

Related branches:
    push branch: 
  parent branch: http://bazaar-vcs.org/bzr/bzr.dev/
rwilbur at transform:~/bzr/bzr.dev$ /usr/bin/bzr pull
Using saved location: http://bazaar-vcs.org/bzr/bzr.dev/
bzr: ERROR: Unknown branch format: 'Bazaar Branch Format 7 (needs bzr
1.6)\n'