[Adium-devl] Google Summer of Code 2007 merge update?

[Evan Schoenberg]

Quoting Augie Fackler <lists at durin42.com>:

>
> On Sep 5, 2007, at 8:10 AM, Evan Schoenberg wrote:
>
>> Augie: What's our status on the Summer of Code 2007 merges?  Does
>> subversion 1.5 really make this a seamless, fast, easy process?
>
> Yeah! I'm 50% or so on a patch which lets us use FileMerge whenever
> we get conflicts in the merge, which is a Huge Time Saver. I'm
> actually going to post a preliminary version of the patch to the
> Subversion dev list today for feedback.
Awesome :)

> Honestly, I'd be happy to run the merges. Peter also has a copy of
> svn 1.5 built (assuming he kept it). Subversion depends on expat,
> apr, apr-util and (neon or serf).
>
> The process basically means we merge trunk to the branch to make them
> in sync, then merge the branch back to trunk. In theory, it's a
> totally painless process. sussman (or some other svn'er) will
> definitely help us out if it turns out to be Hard.
>
> I'd like to do the first one just in case things do go wrong, and
> I'll attempt to document as I go. Thursday sounds like a good day to
> me, if nobody objects I can run one of the merges sometime during the
> day.

A plan *and* a support system? Excellent!

Documenting as you go is a good idea, in any case, though it makes  
sense if you can do just go ahead and do all of them (assuming they  
are all ready for merging).  No objections to Thursday - I look  
forward to tomorrow :)

-Evan

----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.