[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r18231 - branches/1.3.x

From: Blair Zajac <blair_at_orcaware.com>
Date: 2006-01-25 23:16:50 CET

David James wrote:
>>>I looked at r18215, and I didn't find it was immediately obvious how
>>>to merge it to the 1.3.x branch. For this reason, I'd like to see a
>>>merge branch before I can approve the change.
>>When I did the merge, I was surprised to see how and what was marked as a conflict.
>>But look at the original commit and you'll see it's a trivial two lines and
>>could be applied by hand.
> Thanks! Using your instructions, I've created a merge branch to do
> this. It's in the STATUS file.
> Cheers,
> David

Thanks David!


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jan 25 23:17:35 2006

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.