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

Re: SVN question on backtracking

From: Jean-Marc van Leerdam <j.m.van.leerdam_at_gmail.com>
Date: Wed, 9 Jul 2008 07:44:54 +0200

Hi,

On 09/07/2008, ATLeich <k.eichelberger_at_gmail.com> wrote:
> Ok, not sure how to phrase this, first off, as you'll probably notice
> in my post, I'm fairly new to subversion and tortoiseSVN altogether,
> so forgive my ignorance. I'm not even sure what term to use to
> describe my situation, so I'll explain it here.
>
> I've been using TortoiseSVN along with Springloops for version control
> for a little while successfully, until I recently encountered a
> situation that I'm not sure the best method for dealing with it is.
> Basically, I reached a point where I was developing some new
> functionality, tested it locally, then committed the changes to SVN -
> putting me at version number 49. Upon deploying that to my production
> box, it took down the entire site (another story, no need to get into
> it here). So I rolled back to 48 and site was fixed.
>

Not sure how you 'rolled back', as that is a term not used with
Subversion. You either updated to a previous revision (most likely,
but incorrect) or you reverted the changes from revision 49 (what you
wanted to do, but probably didn't since the files did not get properly
deleted).

What you need to do here is:
1 update your working copy to the current latest version (HEAD) (right
click->SVN Update).

2 Check if the offending files are present in your working copy (they
probably are).

3 do the SVN Delete again on these files and verify your other modifications

4 commit the deletions (and your other changes made to the working copy)

> I found another solution for what I was trying to do and no longer
> needed those files that were causing the issue. So I deleted them
> through the TortoiseSVN->Delete menu and made some changes to some
> other files, and committed them to SVN (which also looks like it
> committed the deletes). Now at version 50, I deploy and again the
> site goes down, so it looks like it's still uploading the files from
> 49. Again, I rollback to 48 and all is good and well.

Where do you deploy from? From the repository or from your working
copy? Because if you deploy from your working copy, the offending
files may still be available in your working copy (but unversioned):
SVN does not automatically delete files with local modifications.

>
> Since then, I've made a few changes to other files, leaving me at
> version 51 right now, but I still can't deploy it. So, my question is
> obviously, how do I fix this? I do not want the files from 49 going
> up to the server, but it seems like everything since then includes
> them (even though I deleted them). I'm not familiar with Branching
> and if that's what I should do or what, but if someone could provide
> me, step by step (dummy it down), what I should do to get back on
> track that would be a great help. Thanks in advance!
>

I hope the above pointers help, but I relly recommend you read the
excellent Subversion and TSVN manuals available:

http://svnbook.red-bean.com

http://tortoisesvn.net/docs/release/TortoiseSVN_en

-- 
Regards,
Jean-Marc
----------------
    ___
   // \\  @@     "De Chelonian Mobile"
  / \_/ \/._)    TortoiseSVN
 <\_/_\_/ /      The coolest Interface to (Sub)Version Control
  /_/   \_\      Check out http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-09 07:45:05 CEST

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