uncommitted changes in rsync and branch of bzr.dev

[Jamie Wilkinson]

Hi!

After a month or more since I've last merged from bzr.dev, I tried it today
and got some conflicts; there's been a lot of changes so I thought "Ah well,
I'll just rsync from main and start again with that one."

So now after rsyncing from bazaar-ng.org::bazaar-ng/bzr/bzr.dev/ I have a
branch which doesn't look right:

dawn% bzr status
removed:
  bzrlib/reconcile.py
  bzrlib/tests/blackbox/test_bound_branches.py
  bzrlib/tests/blackbox/test_conflicts.py
  bzrlib/tests/blackbox/test_reconcile.py
  bzrlib/tests/branch_implementations/test_bound_sftp.py
  bzrlib/tests/branch_implementations/test_update.py
  bzrlib/tests/repository_implementations/test_reconcile.py
  bzrlib/tests/test_reconcile.py
modified:
  NEWS
  bzrlib/branch.py
  bzrlib/builtins.py
  bzrlib/bzrdir.py
  bzrlib/check.py
  bzrlib/commit.py
  bzrlib/conflicts.py
  bzrlib/diff.py
  bzrlib/errors.py
  bzrlib/fetch.py
  bzrlib/info.py
  bzrlib/option.py
  bzrlib/progress.py
  bzrlib/repository.py
  bzrlib/revision.py
  bzrlib/store/weave.py
  bzrlib/tests/__init__.py
  bzrlib/tests/blackbox/__init__.py
  bzrlib/tests/blackbox/test_checkout.py
  bzrlib/tests/blackbox/test_commit.py
  bzrlib/tests/blackbox/test_diff.py
  bzrlib/tests/blackbox/test_info.py
  bzrlib/tests/blackbox/test_update.py
  bzrlib/tests/blackbox/test_upgrade.py
  bzrlib/tests/branch_implementations/__init__.py
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py
  bzrlib/tests/interrepository_implementations/test_interrepository.py
  bzrlib/tests/repository_implementations/__init__.py
  bzrlib/tests/repository_implementations/test_fileid_involved.py
  bzrlib/tests/repository_implementations/test_repository.py
  bzrlib/tests/test_errors.py
  bzrlib/tests/test_revision.py
  bzrlib/tests/test_source.py
  bzrlib/tests/test_tsort.py
  bzrlib/tests/workingtree_implementations/test_workingtree.py
  bzrlib/tsort.py
  bzrlib/weave.py
  bzrlib/workingtree.py
  contrib/pwk

I'm confused: this is a fresh rsync.  If I then bzr branch bzr.dev bzr.dev.1
and run status on that bzr.dev.1 branch, I get the same output.

Anyone have any insight into this?  Obviously I have no idea why thes files
are removed/modified, so I don't want to commit them, but I'm prevented from
doing my own development on these branches because of this.

dawn% bzr --version bzr (bazaar-ng) 0.8pre
  bzr checkout, revision 1565
  nick: bzr.dev
  revid: pqm at pqm.ubuntu.com-20060306004926-6d7a10c990bc17d1