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

Re: Weird conflicts for no reason

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Fri, 10 Oct 2008 09:19:44 +0100

2008/10/10 Robert Dailey <rcdailey_at_gmail.com>:
> Hey Stefan,
>
> I realize this is a question for the Subversion mailing list but I was
> curious as to what you thought about it first.
>
> Have you ever created a feature branch, kept it up to date, and then got
> ready to merge it back to trunk and you get random file conflicts? The
> conflicts usually conflict the entire file, and viewing the conflicts
> through TortoiseMerge doesn't show any conflict. You actually have to open
> the file manually and look at the position of the <<<<<<<<<<<< and >>>>>>>>>
> symbols to see the conflicted areas. When I merge the feature branch back to
> trunk, I use the bottom of the 3 merge options in the merge dialog.
>
> Note that I'm using the latest nightly build, and I'm not sure what version
> of SVN that it is using. The conflicts I'm getting should never happen,
> since they are exactly the same content-wise in the feature branch as they
> are in the trunk. Just wondering if you've seen this issue.

Most likely the line endings have changed. There is an option in
TMerge to show line endings, and to include line-endings in the diff.
If this turns out to be the problem, make sure you set svn:eol-style
to avoid it.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-10-10 10:19:55 CEST

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