[rfc] [patch] revisionspec fix for branch:../../branch2

[John Arbash Meinel]

Denys Duchier wrote:
> Robert Collins <robertc at robertcollins.net> writes:
> 
> 
>>>With at least the alphabetical fix, +1 from me.
>>
>>Ditto - alpha fix, +1.
> 
> 
> +2ed patch has been merged into my bzr.patches branch
> 
> --Denys

I'm not going to withdraw my +1, but you made this change:

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py
+++ bzrlib/tests/__init__.py
@@ -57,8 +57,9 @@
                       bzrlib.errors,
                       bzrlib.inventory,
                       bzrlib.merge3,
+                      bzrlib.option,
                       bzrlib.osutils,
-                      bzrlib.store,
+                      bzrlib.store
                       ]

In python, lists can end with a comma: [a, b, c,] is a valid list.

I would leave it in, so that when someone adds 'bzrlib.zzzzz' we end up
with a single line change, which makes it more obvious what is being
changed. (and maintains annotations, and decreases chances of conflicts)

So in jam-integration, I'm merging your branch, but undoing that change.

This has been added to jam-integration revno=1505

Also, in your bzr.patches branch, you have some stuff like the
test_hashcache changes where you have a
try:
  func('a')
except FixThisError:
  pass

Did we +2 'FixThisError'? It just looks funny to me. If we did, I can
merge it.

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/20060117/d324b170/attachment.pgp