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

Re: Message "Not a working dir" using Merge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 06 Apr 2009 18:23:11 +0200

Bas Schouten wrote:
> I am using TortoiseMerge as the merging tool together with Starteam
> version control.
>
> From starteam the merge tool is called with the base, theirs and mine
> file, and a resulting file in a temp directory. This resulting file
> is later used bu starteam to check-in the lastest (merged) version of
> the file.
>
> Since the lastest version after merging the files in TortoiseMerge
> and saving the result, i get an error "C:\Temp is not a working
> doirectory". I understand the message from a tortoise standpoint, but
> since im just using the merge tool I would like to disable this
> message.
>
> How can i do that?

This can only happen if the target file (the one where the changes are
saved to) does not exist yet when you save it.
In that case, TMerge calls TortoiseProc to add that 'new' file to
version control.

I guess I'll add an option to disable this behavior.
But first, can you confirm that the file does not exist when you save it?

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1562894
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-04-06 18:23:39 CEST

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