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

Re: [TSVN] Re: TortoiseMerge bug & feature request

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-09-04 09:27:23 CEST

Simon Large wrote:

> I can repeat this very easily.
> Check out into 2 dirs A & B.
> Edit same line in a file in A & B.
> Commit A
> Update B
> Double click on the 'conflicted C:\Temp\Test4a\Test.c' line
> It also happens if I right-click on the file directly and select Edit
> Conflicts
> Maybe it is only a problem in build 1618.

Fixed in revision 1639. And another bug I found while hunting for that
one ;)

> And another thing (oh no, not *another* other thing ... )

You forgot the smiley here ;)

> If I try to commit the directory, there is no clear indication that there
> are still conflicts. There is a big clue in that I get Test.c.mine,
> Test.c.r5 and Test.c.r6 showing up in the unversioned files, but if the
> ignore list is not set up so there are a lot of other unversioned files you
> might miss it. My directory is only 1 level deep so I can see the conflict
> overlay easily, but in a deep folder structure I would not. I don't know if
> it is easy for the commit dialog to detect that.

The conflicted files should actually be shown in red! And if you try to
commit such a file, Subversion will throw an error too.


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Sep 11 20:13:29 2004

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

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