Re: eol-style merging problem

On 6/15/06, Shakespeare, Simon (Pensions)
<Simon.Shakespeare@capita.co.uk> wrote:
> 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.

Without having this tested:
I'd say the merge will go just fine. You would only get a conflict, if
you changed the EOL's both on trunk and your branch *differently*. But
you only changed the EOLs on trunk and left it on your branch alone.
So you shouldn't get any conflicts (but of course, every file will
show up as "merged" because every line has a changed EOL).

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org