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

RE: Re: How to recommit everything again

From: Roy Budiantara <rxbudian_at_hotmail.com>
Date: Thu, 4 Nov 2010 00:15:12 -0700 (PDT)

> On Tuesday 02 November 2010, Roy Budiantara wrote:
> > I am having this problem where some of my files are marked as normal (with
> > green checkmarks), which, I am assuming, means that TortoiseSVN consider it
> > current.
>
> Unchanged from the BASE revision of the working copy. Note that you can change
> that revision using "Update" or "Update to Revision..".

Wouldn't that overwrite my working copy?
My working IS the latest version. No one else is working on it except for me and if I did that, everything that is unmodified locally will be written over by the one in the repository.

>
> > But apparently my local version of the file is not in the Repository.
>
> How did you determine that?
>
> > Now I would understand that if there are multiple users working on the
> > repository, this would probably happen often, but I am the only one working
> > with it
>
> You don't need a second user, a second working copy or a combination
> of "Update.." or maybe even "Switch.." could have the same effect.
>
> > when I tried to Diff With Previous Version (by adding a character on my
> > working copy) it's comparing it with 10 revisions back.
>
> Seems like you WC's BASE was 10 revisions behind the repository's HEAD.
>
>
> Suggestion:
> 1. Run "Update" on your WC. This will change the WC's BASE revision to the
> latest of the repository. I guess this will already do the job.
> 2. If not, there might be various ways that your WC can get corrupted, e.g.
> when some broken tool changes things in the .svn folders. In that case, first
> retrieve the content minus the metadata by doing an "Export...". I'd include
> the unversioned files, too. Then, check out a new WC and copy the exported
> data over it. You might have to adjust added/deleted files afterwards. Then,
> you have a working copy that corresponds to the HEAD of your repository.
>
>
> Uli
>
Maybe I should tell you some background on this.
My friend came to me to ask for help in finishing a project that uses Magento e-commerce engine.
I had 3 different versions of source code prior to using the SVN.
1. the source code that was in the development server
2. the source code that was backed up 2 weeks before
3. the unmodified Magento source code that was downloaded 8 weeks after it started being modified. I asked for the original code, but my friend said that they're using the latest version that was available for download at the site.

So, I try to be good and include all 3 versions into SVN. Also I found out that my friend had played with SVN repository before and went up to revision no 7 with nothing in it.
First I committed the unmodified Magento source (Rev 8), then I copied in the backup version to the directory and deleted some of the files and committed this version (Rev 9), then I copied the development code to the directory and committed that version(Rev 10).
After that I checked to make sure my working copy directory contains the development version and assumed that since I committed that version, any file that is different between the backup and development would be in SVN

I thought everything was fine until a few days ago, I ran the "Diff with previous version" on my working copy and I saw more differences than the things I changed in my local repository.

I don't know what has happened, but I know that my working copy is the only copy outside SVN and it is the latest version. At this moment, all I want to know is how to commit everything on my working copy regardless of whether it has been changed or not.

Thank you for your help too doomster

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2678632

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-11-04 08:15:17 CET

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