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

Re: I am stuck, again

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 17 Nov 2009 19:16:07 +0100

Willy wrote:
> I understand that there is a proper way to rename files using Tortoise
> SVN.
>
> My style of programming is to refactor rather ruthlessly and most of
> the time when I rename something, SVN shows it to me as the old name
> being missing and the new one ready to be added. I accept this.
>
> But all too often everything gets completely messed up. I try to
> commit and Tortoise tells me I cannot and tells me what to do such as
> an Update. I follow its advice, which doesn't work, and it tells to
> do something else, such as a Clean Up. This typically goes in a
> circle back to the original advice.

Does your refactoring include renaming/moving folders? In that case,
you're corrupting the working copy. Your only solution would be to get
an svn plugin for your IDE which can tell svn about your refactoring.

If you're only moving/renaming files, try this:
http://tortoisesvn.net/node/351

> How I wish Tortoise had a command that said "just accept (wtf) is in
> this folder!!!!".

It tries, but it doesn't know how since you've messed up the working copy :)

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2419040
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-17 19:16:13 CET

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