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

Re: Merging from yourself fails

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 11 Jun 2008 11:03:15 -0400

>> How are we supposed to keep a feature branch up to date with trunk now?
>>
>> Is this fixed in a newer rc than rc8?
>
> No, it is not even fixed in trunk yet. We decided a long time ago to
> ship 1.5.0 with this bug included.

Here is the patch that was posted recently:

http://svn.haxx.se/dev/archive-2008-06/0208.shtml 

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-11 17:03:28 CEST

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.