Pull "Removed revisions" message confusing

[Daniel Clemente]

  I was shocked today when I did bzr pull -v from a bzr+ssh:// branch. Under the heading „Added revisions“ I saw the list of new remote revisions I was interested in, but there was also another heading, „Removed revisions“, which listed many of my local revisions.
  First I thought that Bazaar had somehow done a pull --overwrite and my local revisions were lost (removed, as the title says).
  After further examination I noticed that all the local and the remote revisions were now present in my local branch.

  So my wish is: whatever that „Removed revisions“ means, please don't call them removed! The user might believe that the removal was the result of the issued pull command, which is not the case.

[Vincent Ladeuil (vila)]

Can you suggest a better wording that would have avoided the confusion ?
Keep in mind that pull --overwrite doesn't really remove the revisions from repository neither, only from your left-hand ancestry.
The same apply here.

[Daniel Clemente (n142857)]

I can't give a better message since I don't understand what the message tries to explain; sorry. I can just suggest „revisions also present at destination (no action required)“ if that's not wrong.
I would show this section *below* the „Added revisions“ one, since „Added revisions“ contains more important information (new things).

[GuilhemBichot (guilhem-bichot)]

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.

[John A Meinel (jameinel)]

-----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-----

[Launchpad Janitor (janitor)]

[Expired for Bazaar because there has been no activity for 60 days.]

[GuilhemBichot (guilhem-bichot)]

I think it should not be marked expired. The oddity of "removed" revisions remains.