SteveKing <steveking@gmx.ch> wrote on 07/08/2005 03:37:10 PM:
> Mark Phippard wrote:
> >>You mean TSVN called the file wrong?
> >
> > I think so. I displayed the contents of the argument and it was just
the
> > folder name. In what way would the %merged and %mine normally differ
> > anyway? When I displayed the variables, %merged was my document,
%base
> > and %theirs were the correct rXXX versions and %mine was the path to
the
> > folder containing the document.
>
> %merged usually doesn't exist yet or is the same as %mine. %merged is
> the path where the result of the merge should be saved.
>
> How exactly did you call the diff with TSVN? From the explorer context
menu?
I used Update to create a local conflict. Then did Edit Conflicts.
Mark
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jul 8 21:39:09 2005