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

eol-style merging problem

From: Shakespeare, Simon \(Pensions\) <Simon.Shakespeare_at_capita.co.uk>
Date: 2006-06-15 11:33:48 CEST

Firstly - apologies for asking this question here but I asked the svn user list &
got no response & now I'm a bit desperate !

Can anyone tell me if the following would cause a merge conflict..

rev 1 - change prog1
rev 2 - set property eol-style = native on prog1
rev 3 - change prog1 again

Then merge rev1 & rev3 to a different branch i.e. without the eol-style change.

The reason I ask is cos in reality I set the eol-style = native on all of my progs.
& now only wish to merge some of these progs. to the branch.

Thanks for any help (any workarounds welcome) - Simon

I'm using svn 1.3.0 & TortoiseSVN-

This email and any files transmitted with it are confidential, and may be subject to legal privilege, and are intended solely for the use of the individual or entity to whom they are addressed.
If you have received this email in error or think you may have done so, you may not peruse, use, disseminate, distribute or copy this message. Please notify the sender immediately and delete the original e-mail from your system.

Computer viruses can be transmitted by e-mail. Recipients should check this e-mail for the presence of viruses. The Capita Group and its subsidiaries accept no liability for any damage caused by any virus transmitted by this e-mail.

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Jun 15 11:34:11 2006

This is an archived mail posted to the TortoiseSVN Users mailing list.

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