0.15 release date changes

[John Arbash Meinel]

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

Nicholas Allen wrote:
> 
>> I'd prefer to stick to the usual schedule.
>>
>> I supported taking longer on 0.14, because I felt if we stuck to the
>> usual schedule, we would not have enough improvements to justify a
>> release.  But especially considering how frequently kind-change bugs are
>> being reported, I think we have enough here to justify a release.
> I find that quite an annoying bug and I think it makes sense to have
> release that fixes it as soon as possible.
> 
> Also, would it be possible to squeeze a fix for the push command bug I
> recently reported into 0.15? For me, it is even more annoying as the
> push command no longer works between branches in the same repository. As
> the push command is a fairly basic/essential one it would be great if it
> could be fixed before 0.15 otherwise I imagine many users will report
> this same bug...
> 
> Cheers,
> 
> Nick

Can you try this patch, Nick. I think this fixes the bug.

The bug I can see is that it was trying to lock the source branch for
writing, when it only needs to lock the target branch for writing.


=== modified file 'bzrlib/branch.py'
- --- bzrlib/branch.py    2007-02-06 02:33:42 +0000
+++ bzrlib/branch.py    2007-02-12 22:12:38 +0000
@@ -1446,7 +1446,7 @@
             if master_branch:
                 master_branch.unlock()

- -    @needs_write_lock
+    @needs_read_lock
     def push(self, target, overwrite=False, stop_revision=None):
         """Updates branch.push to be bound branch aware."""
         bound_location = target.get_bound_location()


I ran into it because I was doing a different thing, which locked the
source for read before other actions, and I got a mixed-lock error. (It
tried to grab a write lock on a branch that was already read-locked).

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

iD8DBQFF0ObOJdeBCYSNAAMRApM/AJ92YJOq8hefX8r/Pr5sJMxZSlplrwCgsS94
Fmrw7myUwrA89XmL8owiNuk=
=JbDR
-----END PGP SIGNATURE-----