[PATCH] 306394 fix (warning, not error, on non-existent file)

[Karl Fogel]

Aaron Bentley <aaron at aaronbentley.com> writes:
> Did you ever commit to bzr.dev-trunk?  It seems like you committed a
> revision called "kfogel at red-bean.com-20090108210552-4cv8mvc6sv0gdbn1".

Yes, I did.  That was (meant to be) a merge from upstream mainline:

   $ bzr log --show-ids --long -c3931
   ------------------------------------------------------------
   revno: 3931
   revision-id: kfogel at red-bean.com-20090108210552-4cv8mvc6sv0gdbn1
   parent: pqm at pqm.ubuntu.com-20090108195901-lechto0ubxsirqrd
   parent: pqm at pqm.ubuntu.com-20090108205158-sez8mmopbhn2xkr5
   committer: Karl Fogel <kfogel at red-bean.com>
   branch nick: bzr.dev-trunk
   timestamp: Thu 2009-01-08 16:05:52 -0500
   message:
     Merge from mainline.
   [...]
   $ 

I now know that I should only use "pull" for keeping a mirror branch
up-to-date.  (I'd assumed that when I committed the merge of a bunch of
upstream changes, the resultant tree will contain only changes that
upstream also contains -- that my commit would not itself be considered
a change, since all it did was pull in other, known changes.  Turns out
things don't work that way!  In retrospect, it would be very difficult
for things to work that way.)

> The steps you listed were sane, but you should also set the
> "public_branch" config value of bzr.dev-trunk to
> "http://bazaar-vcs.org/bzr/bzr.dev", e.g.
>
> $ echo "public_branch = http://bazaar-vcs.org/bzr/bzr.dev" >>
>   bzr.dev-trunk/.bzr/branch/config

Done.  (I admit I'm not quite clear on why this is necessary; Googling
and trawling bazaar-vcs.org hasn't totally enlightened me yet.)

> If I'm right that you committed into your local mirror, that's not sane.
>  (But you can fix it with "bzr pull --overwrite -d bzr.dev-trunk")

Done, thanks (and 'bzr log' confirms that the offending revision is
gone).

-Karl