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

RE: Tortoise: How Are Conflicts Defined?

From: Gleason, Todd <tgleason_at_impac.com>
Date: Wed, 20 Aug 2008 14:01:34 -0700

This question probably belongs on users_at_subversion.tigris.org since it
isn't Tortoise-specific.

 

Presuming that in each of those cases the base version was different
from A as well as B, then all those where A and B differ by even a
single character (even whitespace) would be conflicts.

 

You can configure some merge tools to ignore certain types of conflicts
(basically these tools must choose a strategy to automatically resolve
those conflicts), but you cannot configure the internal Subversion
text-based diff to ignore conflicts.

 

I don't think it would be worthwhile to configure the conflict
identification, but I do think it would be useful if you could plug in
an automatic conflict resolver somehow.

 

________________________________

From: Glenn Mehling [mailto:glenn.mehling_at_taxtools.com]
Sent: Wednesday, August 20, 2008 2:32 PM
To: users_at_tortoisesvn.tigris.org
Subject: Tortoise: How Are Conflicts Defined?

 

Hello Everyone. I have a couple of questions about Tortoise. How are
conflicts between two versions determined? Can this
"conflict-identification" methodology be re-configured? For the
following, would any of these be considered conflicts?

* file A, line 12: a... file B, line 12 a...
* file A, line 12: a... file B, line 12 b...
* file A, line 12: aa... file B, line 12 ab...
* file A, line 12: aa... file B, line 12 aa..
* file A, line 12: aaa... file B, line 12 aab...
* file A, <Assembly: AssemblyVersion("1.1.2.2")> ... file B,
<Assembly: AssemblyVersion("1.1.2.3")> ...
* file A, Data Source=CFSDB1;Initial Catalog=DBDev;Integrated
Security=True... file B, Data Source=CFSDB2;Initial
Catalog=DBDevelopment;Integrated Security=True...

I've researched this topic online, but have not been able to find
anything helpful.

Thanks. Glenn
Received on 2008-08-20 23:05:01 CEST

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