[MERGE][#321066] "bzr log -r 1.1.1..1" dotted revnos in the wrong order raises ValueError

[John Arbash Meinel]

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

John Arbash Meinel wrote:
> Marius Kruger wrote:
>> ping.
> 
>> this has been in approved state for almost a month, would you mind
>> merging it please?
> 
> Sorry about the delay. I just sent it in.
> 
> John
> =:->
> 

So I submitted this, but the tests you added are now failing because Ian
C changed how logging was done.

Specifically this test:

    def test_log_dotted_revspecs(self):
        self._prepare_merged()
        log = self.run_bzr("log -r 1..1.1.1")[0]
        self.assertRevnos(log, (1, 2, 3, '1.1.1'), ('1.1.2', 4))


It used to be that log always showed the mainline revs, and then giving
a range like that would just figure out what extra mainlines needed to
be included. Ian changed it so that we start at '1.1.1' and then start
searching backwards until we get to '1' and only show those revisions.
So this test changes to:	

        self.assertRevnos(log, (1, '1.1.1'), ('1.1.2', 2, 3, 4))


No big deal there. However the other test:
    def test_log_reversed_dotted_revspecs(self):
        self._prepare_merged()
        self.run_bzr_error(('bzr: ERROR: End revision not found after'
                            ' the start revision.\n',),
                           "log -r 1.1.1..1")

Now gets a different error:
bzr: ERROR: Start revision not found in history of end revision.

This is because we start walking at revision '1' and we never get to
revision '1.1.1'.

Again, I would be fine changing the test, but it means that we aren't
actually testing that you trap ValueError.

Would it be possible to update your changes against bzr.dev and submit
them again? I spent some time to try to resolve them myself, but at this
point I wonder if your specific problem is already fixed by Ian's work.

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

iEYEARECAAYFAkmit7QACgkQJdeBCYSNAAP/1QCgpbIeJ2Gh4JfpIleeor2mDMAi
1NMAoJIZpbLY6Yh13aApKmzIYAMHa3qD
=x92e
-----END PGP SIGNATURE-----