update branch at rev 2229

[Richard Wilbur]

On Thu, 2009-07-02 at 09:00 +1000, Martin Pool wrote:
> 2009/7/2 Richard Wilbur <richard.wilbur at gmail.com>:
> > On Fri, 2009-06-19 at 09:24 +1000, Martin Pool wrote:
> >> 2009/6/19 Richard Wilbur <richard.wilbur at gmail.com>:
> >> > Thanks for the suggestion Martin.  I downloaded the source package from
> >> > the PPA (still 1.15-1, I see) and built the binary powerpc package as
> >> > follows.  Where should I put it to make it available to others?
> >>
> >> Probably the easiest thing right at the moment would be to put it into
> >> the download files in <https://launchpad.net/bzr/+download> because
> >> you just need a Launchpad account to put it there.  (Send me your
> >> account name and I'll give you access.)
> >>
> > Next chapter of this story:  I have returned from vacation, uploaded the
> > signed bzr 1.15-1 powerpc binary package to the bzr download area, tried
> > it on my system and found it didn't seem to want to deal with the old
> > repository and branch formats.
> >
> > Downloaded bzr 1.16-1 source, built powerpc binary package, uploaded the
> > signed bzr 1.16-1 powerpc binary package to the bzr download area,
> > upgraded my local install, tried it on my system and it recommended
> > upgrading the (unspecified) repository format.  I tried upgrading the
> > repository and it threw an exception.  I have attached the log.
> 
> You should probably be packaging, and using 1.16.1 instead of 1.16-1.
> There are at least a couple of important fixes there, though I'm not
> sure if either fixes your problem.
> 
> Please file a bug with your traceback importance=high.
> 
I had downloaded the source package from the PPA when the most recent
available was 1.16-1.  Thanks for the suggestion!  I downloaded the new
source package (1.16.1-1), built the new binary package, uploaded to bzr
project download area, upgraded my local bzr install and tried to
upgrade repository and branches.

Now, bzr says they are not in need of upgrading.  So the new version did
solve the upgrade problem!

I tried to update my bzr.dev branch and it complained the repository was
missing a certain commit.  I figured maybe I should just pull down the
latest as my bzr.dev branch was meant to follow the trunk and didn't
have any changes.  After correcting a dynamic host configuration problem
caused by a rogue dhclient, the bzr pull worked with only two conflicts.
I resolved the conflicts by deleting the files from some directories
that had been removed in the trunk and then deleting the directories
themselves.

My bzr.dev branch seems to be in good health now, but I had changes in
my child branch 'giveback' that I wanted to merge up to the current
revision.  bzr update in the child branch throws an exception because it
claims the repository doesn't contain a revision I created after
resolving some conflicts in May.  Did I overwrite local commits in my
repository by doing the pull in bzr.dev?

How would you suggest proceeding with this latest hurdle?  I have
attached a log of the most recent interactions.

Sincerely,

Richard
-------------- next part --------------
############# Upgraded to new build of 1.16.1-1

rwilbur at transform:~/bzr$ bzr --version
Bazaar (bzr) 1.16.1
  Python interpreter: /usr/bin/python 2.5.2
  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, 2009 Canonical Ltd.
http://bazaar-vcs.org/

bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and
you may use, modify and redistribute it under the terms of the GNU
General Public License version 2 or later.

rwilbur at transform:~/bzr$ bzr info .
Shared repository with trees (format: pack-0.92)
Location:
  shared repository: .
rwilbur at transform:~/bzr$ bzr info bzr.dev
Repository tree (format: pack-0.92)
Location:
  shared repository: .
  repository branch: bzr.dev

Related branches:
    push branch: 
  parent branch: http://bazaar-vcs.org/bzr/bzr.dev/
rwilbur at transform:~/bzr$ bzr info giveback
Repository tree (format: pack-0.92)
Location:
  shared repository: .
  repository branch: giveback

Related branches:
    push branch: 
  parent branch: bzr.dev
rwilbur at transform:~/bzr$ bzr upgrade
bzr: ERROR: The branch format Meta directory format 1 is already at the most recent format.
rwilbur at transform:~/bzr$ bzr upgrade .
bzr: ERROR: The branch format Meta directory format 1 is already at the most recent format.
rwilbur at transform:~/bzr$ bzr upgrade bzr.dev
bzr: ERROR: The branch format Meta directory format 1 is already at the most recent format.
rwilbur at transform:~/bzr$ bzr update bzr.dev
bzr: ERROR: Revision {pqm at pqm.ubuntu.com-20070111014309-058f987c23817400} not present in "KnitPackRepository('file:///home/rwilbur/bzr/.bzr/repository/')".
rwilbur at transform:~/bzr$ bzr pull bzr.dev
bzr: ERROR: Not a branch: "/home/rwilbur/bzr/.bzr/branch/".
rwilbur at transform:~/bzr$ which bzr
/usr/bin/bzr
rwilbur at transform:~/bzr$ cd bzr.dev
rwilbur at transform:~/bzr/bzr.dev$ /usr/bin/bzr update
bzr: ERROR: Revision {pqm at pqm.ubuntu.com-20070111014309-058f987c23817400} not present in "KnitPackRepository('file:///home/rwilbur/bzr/.bzr/repository/')".
rwilbur at transform:~/bzr/bzr.dev$ /usr/bin/bzr upgrade
bzr: ERROR: The branch format Meta directory format 1 is already at the most recent format.
rwilbur at transform:~/bzr/bzr.dev$ /usr/bin/bzr pull
Using saved parent location: http://bazaar-vcs.org/bzr/bzr.dev/
bzr: ERROR: Connection error: Couldn't resolve host 'bazaar-vcs.org' (-2, 'Name or service not known')
###### Pull failed immediately because of resolver misconfiguration due to
###### rogue dhclient.  Reconfigured resolver.
rwilbur at transform:~/bzr/bzr.dev$ /usr/bin/bzr pull
Using saved parent location: http://bazaar-vcs.org/bzr/bzr.dev/
bzr: ERROR: Connection error: Couldn't resolve host 'bazaar-vcs.org' (-2, 'Name or service not known')
###### Pull died after ~20 minutes of successfully downloading because of
###### resolver misconfiguration due to rogue dhclient.  Identified and killed
###### rogue dhclient, and reconfigured resolver before continuing.
rwilbur at transform:~/bzr/bzr.dev$ /usr/bin/bzr pull
Using saved parent location: http://bazaar-vcs.org/bzr/bzr.dev/
+N  bzrlib/_bencode_pyx.h
+N  bzrlib/_bencode_pyx.pyx
[...]
 M  tools/win32/ostools.py
 M  tools/win32/start_bzr.bat
Conflict: can't delete bzrlib/tests/interversionedfile_implementations because it is not empty.  Not deleting.
Conflict: can't delete bzrlib/tests/revisionstore_implementations because it is not empty.  Not deleting.
2 conflicts encountered.                                                                                    
Now on revision 4507.
rwilbur at transform:~/bzr/bzr.dev$ ls -al bzrlib/tests/interversionedfile_implementations/
total 26
drwxr-xr-x  2 rwilbur rwilbur   112 2009-07-03 15:55 .
drwxr-xr-x 21 rwilbur rwilbur 10368 2009-07-03 15:55 ..
-rw-r--r--  1 rwilbur rwilbur  1261 2006-10-17 20:34 __init__.pyc
-rw-r--r--  1 rwilbur rwilbur 11454 2006-10-17 20:34 test_join.pyc
rwilbur at transform:~/bzr/bzr.dev$ cd bzrlib/tests
rwilbur at transform:~/bzr/bzr.dev/bzrlib/tests$ rm -rf interversionedfile_implementations
rwilbur at transform:~/bzr/bzr.dev/bzrlib/tests$ rm -rf revisionstore_implementations
rwilbur at transform:~/bzr/bzr.dev/bzrlib/tests$ /usr/bin/bzr conflicts
Conflict: can't delete bzrlib/tests/interversionedfile_implementations because it is not empty.  Not deleting.
Conflict: can't delete bzrlib/tests/revisionstore_implementations because it is not empty.  Not deleting.
rwilbur at transform:~/bzr/bzr.dev/bzrlib/tests$ /usr/bin/bzr resolve
0 conflict(s) auto-resolved.
Remaining conflicts:
Conflict: can't delete bzrlib/tests/interversionedfile_implementations because it is not empty.  Not deleting.
Conflict: can't delete bzrlib/tests/revisionstore_implementations because it is not empty.  Not deleting.
rwilbur at transform:~/bzr/bzr.dev/bzrlib/tests$ /usr/bin/bzr resolve --all
rwilbur at transform:~/bzr/bzr.dev/bzrlib/tests$ /usr/bin/bzr conflicts
rwilbur at transform:~/bzr/bzr.dev/bzrlib/tests$ cd ../../
rwilbur at transform:~/bzr/bzr.dev$ /usr/bin/bzr status
unknown:
  .bzr.backup/
  backup.bzr/
rwilbur at transform:~/bzr/bzr.dev$ /usr/bin/bzr info
Repository tree (format: pack-0.92)
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 update
Tree is up to date at revision 4507.
rwilbur at transform:~/bzr/bzr.dev$ /usr/bin/bzr version-info
revision-id: pqm at pqm.ubuntu.com-20090703154118-f5ncmxfk75wgzh6l
date: 2009-07-03 16:41:18 +0100
build-date: 2009-07-05 17:04:27 -0600
revno: 4507
branch-nick: bzr.dev
rwilbur at transform:~/bzr/bzr.dev$ cd ../giveback
rwilbur at transform:~/bzr/giveback$ /usr/bin/bzr version-info
bzr: ERROR: bzrlib.errors.NoSuchRevision: KnitPackRepository('file:///home/rwilbur/bzr/.bzr/repository/') has no revision richard.wilbur at gmail.com-20090528154043-z7f960f0459c984f

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 729, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 924, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 560, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/cmd_version_info.py", line 116, in run
    builder.generate(self.outf)
  File "/usr/lib/python2.5/site-packages/bzrlib/version_info_formats/format_rio.py", line 39, in generate
    rev = self._branch.repository.get_revision(revision_id)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 138, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/repofmt/knitrepo.py", line 208, in get_revision
    return self.get_revision_reconcile(revision_id)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 138, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1700, in get_revision_reconcile
    return self._get_revisions([revision_id])[0]
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 138, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 1718, in _get_revisions
    raise errors.NoSuchRevision(self, record.key[0])
NoSuchRevision: KnitPackRepository('file:///home/rwilbur/bzr/.bzr/repository/') has no revision richard.wilbur at gmail.com-20090528154043-z7f960f0459c984f

bzr 1.16.1 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'version-info']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
  bzrtools             /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [1.16]
  gtk                  /usr/lib/python2.5/site-packages/bzrlib/plugins/gtk [0.95.0.final.1]
  launchpad            /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [1.16.1]
  netrc_credential_store /usr/lib/python2.5/site-packages/bzrlib/plugins/netrc_credential_store [1.16.1]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.
rwilbur at transform:~/bzr/giveback$ /usr/bin/bzr info
Repository tree (format: pack-0.92)
Location:
  shared repository: /home/rwilbur/bzr
  repository branch: .

Related branches:
    push branch: 
  parent branch: /home/rwilbur/bzr/bzr.dev
rwilbur at transform:~/bzr/giveback$