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

[TSVN] entire file in conflict?

From: Eric Hanchrow <offby1_at_blarg.net>
Date: 2005-09-24 01:35:06 CEST

(Tortoise 1.2.2)

I was doing a merge, and had lots of conflicts. One file appeared to
conflict on every line: that is, the left pane showed a big blank
area, followed by the complete text of the file in red; the right pane
showed the complete text of the file in red followed by a big blank
area. (In fact, the actual conflict was just a few lines.)

I can reproduce this with my existing repository.

The file in question was named "makelookup.pm"; I noticed that a file
named "makelookup.pm.merge-left.r0" existed, and was empty.

What might be causing this?

In the movie Ghostbusters, there's a sign in the background of
one scene that says, "Danger! 10,000 Ohms!" I cannot explain to
laymen why people like me think that is uproariously funny.
        -- Steven den Beste
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Sep 24 08:41:07 2005

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