[Box Backup-dev] Merging to trunk

[Chris Wilson]

Hi Ben,

On Fri, 31 Aug 2007, Ben Summers wrote:

> On Thu, 30 Aug 2007, Martin Ebourne wrote:
>
>> Given that Chris is nearly done with his Windows changes it probably
>> makes sense to merge them all to trunk (or replace trunk with Chris's
>> merge tree).
>> 
>> That will encourage more people to test it which can only be good.
>
> A++++ would merge again !!!111eleven!!

I CAN HAZ NEW BRANCH?

> I think a few things have happened in trunk since Chris forked. I 
> suggest merging those into Chris' branch, then replacing it.

I just checked the changelogs on trunk and I don't think anything's 
happened since I created the merge branch (in r709) except James 
O'Gorman's patches to the build system, which I believe I've already 
merged.

So I intend to replace trunk with chris/merge once I've done that.

After that chris/merge will no longer exist, but chris/general will 
continue to, and will be the place where I do most of my work. I'll try to 
keep merging into trunk regularly to avoid the same thing happening again. 
Alternatively, I might start using bazaar as a local repository and using 
tailor to export changesets to trunk when they're ready.

> Some great work there from Chris. It's kind of like he's taken over. 
> Which is good! :-)

Thank you all for your support! I couldn't have done it without you.

Cheers, Chris.
-- 
_____ __     _
\  __/ / ,__(_)_  | Chris Wilson <0000 at qwirx.com> - Cambs UK |
/ (_/ ,\/ _/ /_ \ | Security/C/C++/Java/Perl/SQL/HTML Developer |
\ _/_/_/_//_/___/ | We are GNU-free your mind-and your software |