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

Re: BUG: Resolve not working

From: Tobias Schäfer <tobiasschaefer_at_gmx.de>
Date: 2006-12-19 17:26:44 CET

On Tuesday 19 December 2006 16:25, Jeff Pierson wrote:
> I've noticed in version 1.4.1.7992 that resolving no longer seems to be
> working. This is the first version of TortoiseSVN that I've noticed this
> issue.

I've tried reproducing this with 1.4.1 and the latest nightly build but to
no avail.

After having selected several conflicted items and choosing one of the three
resolved menu item I get the following question:
"Are you sure you want to mark the conflicted file(s) as resolved?"

After confirming the status changes to "modified" and the .r* and .mine
files are deleted.

Posting a complete list of steps to get the files into a conflicted state
and resolving them including file names might help.

Tobias

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Dec 19 17:53:16 2006

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.