You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Thorsten Schöning <ts...@am-soft.de> on 2012/01/08 17:57:05 UTC

Conflict shown in TortoiseSVN for working copy of svn 1.7.2 with using Windows Junctions...

Hello all,

today I upgraded all my working copies using TortoiseSVN 1.7.3 and in
one of them I recognized that Tortoise shows a conflict for the root
folder itself and only the root folder, no other file in the working
copy or else. This working copy is special because it's checked out
into my Eclipse workspace and linked using a Windows junction to
another place. With the former Tortoise and working Copy of version
1.6.x and before this worked without problems, but now Tortoise is
showing a conflict symbol and even svn status has different output for
the src and target of the junction.

Think of my directory structur as follows:

..\Eclipse\workspace\someFolder -> ..\Apache\cgi-bin\someFolder2

someFolder was checked out and seem to work, where as someFolder2 is
the junction with src someFolder in the Eclipse workspace, which gets
the conflict icon from Tortoise. The output of svn status differs in
both folders for the folder itself:

D:\Users\tschoening\Documents\Eclipse\Perl\DocBeam-Kernsystem>svn status
M       some.conf

vs.

D:\Users\tschoening\Documents\Apache\cgi-bin\DocBeam-Kernsystem>svn status
~       .
M       some.conf

Does anyone have an idea why svn status gives the first line as ~ in
the junction folder? Does my setup don't work anymore and if so, why?
Any workaround?

Thanks!

Mit freundlichen Grüßen,

Thorsten Schöning

-- 
Thorsten Schöning       E-Mail:Thorsten.Schoening@AM-SoFT.de
AM-SoFT IT-Systeme      http://www.AM-SoFT.de/

Telefon.............030-2 1001-310
Fax...............05151-  9468- 88
Mobil..............0178-8 9468- 04

AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hanover HRB 207 694 - Geschäftsführer: Andreas Muchow


Re: Conflict shown in TortoiseSVN for working copy of svn 1.7.2 with using Windows Junctions...

Posted by Thorsten Schöning <ts...@am-soft.de>.
Guten Tag Thorsten Schöning,
am Sonntag, 8. Januar 2012 um 17:57 schrieben Sie:

> D:\Users\tschoening\Documents\Eclipse\Perl\DocBeam-Kernsystem>svn status
> M       some.conf

> vs.

> D:\Users\tschoening\Documents\Apache\cgi-bin\DocBeam-Kernsystem>svn status
> ~       .
> M       some.conf

Does really nobody has an idea why the ~-line occurs on svn commit in
my junction folder?

Mit freundlichen Grüßen,

Thorsten Schöning

-- 
Thorsten Schöning       E-Mail:Thorsten.Schoening@AM-SoFT.de
AM-SoFT IT-Systeme      http://www.AM-SoFT.de/

Telefon.............030-2 1001-310
Fax...............05151-  9468- 88
Mobil..............0178-8 9468- 04

AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hanover HRB 207 694 - Geschäftsführer: Andreas Muchow