[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: Bas Schouten <bas_at_basbex.com>
Date: Mon, 06 Apr 2009 19:07:10 +0200


Yes indeed, the resulting file does not exist. It is made only as an
intermediate resultfile which will be checked-in by starteam. After
checking in, it is removed


On 6-4-2009 18:23, Stefan Küng wrote:
> 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


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-06 19:07:56 CEST

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