[BUG] mismatched number of revisions

[John Arbash Meinel]

Brian M. Carlson wrote:
> bmc at stonewall:~/text/c_c++/bzr/bzr/bzr.dev% ./bzr missing
> Using last location: http://bazaar-ng.org/bzr/bzr.dev/
> You are missing 2 revision(s):
> ------------------------------------------------------------
> revno: 1524
> committer: Martin Pool <mbp at sourcefrog.net>
> branch nick: bzr.dev (Main development branch)
> timestamp: Mon 2006-01-23 13:09:39 +1100
> message:
>   [merge] robert's integration
> ------------------------------------------------------------
> revno: 1523
> committer: Martin Pool <mbp at sourcefrog.net>
> branch nick: bzr.dev (Main development branch)
> timestamp: Thu 2006-01-19 20:11:39 +1100
> message:
>   Fix 'bzr added' typo, and tests for that command.
> 
>   Patch from Nathan McCallum.
> bmc at stonewall:~/text/c_c++/bzr/bzr/bzr.dev% bzr pull
> Using saved location: http://bazaar-ng.org/bzr/bzr.dev/
> All changes applied successfully.
> 4 revision(s) pulled.
> bmc at stonewall:~/text/c_c++/bzr/bzr/bzr.dev%
> 
> 
> Note the differences in the number of revisions (2 vs 4).  I realize now
> that I used different versions of bzr, but since this is the official
> bzr.dev (from a few days ago), it shouldn't matter.  /usr/bin/bzr is
> 0.8~200601230824 from Jeff Bailey's repository.
> 
> I'll send another bug report in a second.

This is because of how we count the revisions. What happened is that a
merge ([merge] robert's integration), adds extra revisions (whatever it
merged).
I'm not sure what the best solution is.
We could only count the number of mainline revisions pulled. Or we could
have 'missing' include the merged revisions in its output.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060125/4ab29a30/attachment.pgp