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

Re: [TSVN] Use whole file bug in TMerge

From: SteveKing <stefankueng_at_gmail.com>
Date: 2004-10-22 10:47:57 CEST

On Fri, 22 Oct 2004 09:13:38 +0100, Simon Large <slarge@blazepoint.co.uk> wrote:
> Hi Stefan,
> I have a conflicted (test) file. If I right click on a conflicted line
> in either theirs or yours and select "Use this whole file", I get is an
> error dialog saying "An invalid argument was encountered".
> I can zip and send you the base, theirs and mine if you need them.

I think I know what's the problem. I would have fixed it already, but
I can't commit right now. So, just wait...


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Oct 22 11:53:20 2004

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.