Comment 5 for bug 439640

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

GuilhemBichot wrote:
> Hit the same today. I had this branch:
> https://code.launchpad.net/~mysql/mysql-server/mysql-next-mr-bugfixing
> at revision <email address hidden>.
> I did "bzr pull -v" from the parent, which fetched up to <email address hidden>.
> I saw removed revisions like this:
> Removed Revisions:
> ------------------------------------------------------------
> <cut>
> revno: 2963
> committer: Guilhem Bichot <email address hidden>
> branch nick: mysql-next-mr-bugfixing
> timestamp: Mon 2009-10-19 15:14:43 +0200
> message:
> Back-port from 6.0 of the fix for
> BUG#38049 "incorrect rows estimations with references from preceding table"
> 1) it's confusing as a "pull", unless it has "--overwrite", shouldn't remove anything, only possibly add revisions and renumber revisions.
> 2) actually the revision above was not removed, it's still present after "pull" completes.
> So I have the same comment as Daniel: I don't understand what the message means and don't see a possible wording for it.
>
> ** Tags added: mysql
>

I would assume those revisions were moved from being mainline in your
branch to being merged revisions in your branch. For example:

 A
 |
 B
 |\
 C D
 | |
 E |
 | |
 F |
  \|
   G

If your branch is originally at "F", and then you "bzr pull G". then
your branch DAG changes to look like:

 A
 |
 B
 |\
 D C
 | |
 | E
 | |
 | F
 |/
 G

So you 'gain' the revision D G, and C E F then become merged revisions.
I don't think we should be reporting them as removed, though.

(I'm not positive this is what is happening, but I'm guessing it
probably is.)

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAksZK4UACgkQJdeBCYSNAAOADQCgyji0G5w+NWZvOOIOk1WFXmtu
4TEAn2fjEp1eIG9P43nRBl/IYc1Dec+K
=KSIO
-----END PGP SIGNATURE-----