subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ullrich Jans <ullrich.j...@elektrobit.com>
Subject Re: Strange behavior
Date Thu, 15 Aug 2013 05:58:55 GMT
Am 09.08.2013 21:58, schrieb Edwin Castro:
> On 8/9/13 10:27 AM, John Maher wrote:
>> And svn status returns this:
>>        C Build.bat
>>        >   local add, incoming add upon merge
>
> You svn add Build.bat in trunk. Later you svn add Build.bat in your
> branch. Subversion sees those as separate objects with individual history.

I've seen this here, too. It seems to be related to a user creating a 
branch with the OS tools without telling SVN about it, then adding it to 
SVN, then porting over changes by hand, then trying to merge in more 
changes...

To create a branch, I've learned to always do an svn copy between URLs, 
e.g. svn cp file:///repository/trunk file:///repository/branches/mybranch.

Cheers,

Ulli

-- 
Ullrich Jans, Specialist, IT-A
Phone: +49 9131 7701-6627, mailto:ullrich.jans@elektrobit.com
Fax: +49 9131 7701-6333, www.elektrobit.com

Elektrobit Automotive GmbH, Am Wolfsmantel 46, 91058 Erlangen, Germany
Managing Directors: Alexander Kocher, Gregor Zink
Register Court F├╝rth HRB 4886


----------------------------------------------------------------
Please note: This e-mail may contain confidential information
intended solely for the addressee. If you have received this
e-mail in error, please do not disclose it to anyone, notify
the sender promptly, and delete the message from your system.
Thank you.


Mime
View raw message