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

Re: [TSVN] File "names" in 3-way diff?

From: Milen A. Radev <mradev_at_gmail.com>
Date: 2005-02-28 09:53:47 CET

On Mon, 28 Feb 2005 07:36:09 +0100, Fernando P. Nájera Cano
<tortoisesvn@fernandonajera.com> wrote:
> Hi,
>
> I reported exactly the same at
> <mid:1856647727.20050121084740@FernandoNajera.com> 2005/01/21:
>
> > It seems that, when launching external editor for conflicts, the
> > params %tname, %bname, %yname and %bname are replaced by empty.
> >
> > My settings:
> >
> > compare.exe /max /wait /3 /title1:%tname /title2:%bname
> > /title3:%yname %theirs %base %mine %merged /a2
> >
> > What is launched:
> >
> > compare.exe /max /wait /3 /title1: /title2: /title3: file.r2 file.r1
> > file.mine file /a2
> >
> > Using TortoiseSVN 1.1.3.
>
> But nobody even replied.

Well Steve replied to mine: http://svn.haxx.se/tsvn/archive-2004-12/0913.shtml

>
> It's good to know I'm not the only one with this problem.
>
> Best regards,
>
> Fernando Nájera
>

-- 
Milen A. Radev
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Feb 28 10:18:52 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.