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

Re: pointing diff3-cmd to false.bat does not seem to work for me

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-09-22 20:07:38 CEST

Michael Toal wrote:
> Thanks for the quick response. That also worked for me (partially).
>
> What works: If Person A Updates and then makes change A to the
> working copy Person B Updates and then makes change B to the working
> copy Person A Commits change A. Person B Updates in order to
> incorporate any other users changes. There is a conflict because
> false.bat returned an error code. Person B resolves the conflict by
> hand and then Commits their change.
>
> What doesn't work.
>
> Person A Updates and then makes change A to the working copy Person B
> Updates but does not make any changes yet. Person A Commits change A.
> Person B makes change B Person B Updates in order to incorporate any
> other users changes. Change A from Person A's Commit is automatically
> merged into Person B's copy.
>
> You may say I am being paranoid, but I am currently trying to trial
> and advocate subversion.

In that case, you also need to set the line
diff-cmd = "C:\false.bat"
not just
diff3-cmd = "C:\false.bat"

> Offtopic, but just to point out my other advocacy problem is Issue
> 1256, which I notice is 1.5-consider. How can I vote for
> 1.5-definate.

That's a Subversion issue. You need to register on tigris.org, then ask
for observer status in the Subversion project (which is easy and takes
only about a day). Then you can vote.
But voting doesn't help much, because the developers don't even look at
the votes of an issue. If you really need the feature, ask for it again
on their mailing list.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Sep 22 20:07:46 2006

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