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

Re: Issues with v1.5.3

From: Amit Chugh <achugh00_at_gmail.com>
Date: Thu, 2 Oct 2008 10:57:03 -0700 (PDT)

On Sep 26, 4:33 pm, Stefan Küng <tortoise..._at_gmail.com> wrote:
> Amit Chugh wrote:
> > Hi,
>
> > Once I add few files to a folder that is already in the repository.
> > When I select the file that has been added (file with the + overlay)
> > and right click on the added file, I am NOT SEEING the REVERT/UNDO ADD
> > command anymore in version 1.5.3.
>
> The command is only available if you select one file. If you've selected
> multiple added files, it won't show up. But it will show up (revert) if
> you right-click on the parent folder.
>
Thanks Stefan. Since I had multiple files, using the parent folder
option worked for me.

> > In version 1.5.3 whenever a conflict occurs and I click on the
> > RESOLVED command it gives me the sharing violation error and nothing
> > happens i.e. I am not able to resolve the conflict. I have set my EDIT
> > CONFLICT preferences to use Araxis Merge (I thought this might be
> > helpful).
>
> I can't reproduce this here. I've tried with WinMerge (not Araxis
> Merge), but that works ok too.
>
> Is the file in question maybe still open in another application?
>
This is still a problem for me. This problem started happening since
v1.5.x and happens on ALL v1.5.x versions. The problem also happens
even when I try to use Out-Of-Box merge tool that comes with
TortoiseSVN.

I even right clicked on the files and choose UNLOCKER http://ccollomb.free.fr/unlocker/
(the free tool that will list the applications putting the locks on
files) and it showed no locks.

> Stefan
>
> --
>        ___
>   oo  // \\      "De Chelonian Mobile"
>  (_,\/ \_/ \     TortoiseSVN
>    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
>    /_/   \_\    http://tortoisesvn.net
>
>  signature.asc
> < 1KViewDownload

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-10-02 20:02:52 CEST

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