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

Re: How to recommit everything again

From: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: Thu, 4 Nov 2010 09:02:40 +0100

On Thursday 04 November 2010, Roy Budiantara wrote:
> > 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?

If you really need to ask that question, you are missing a few basics of how
SVN works. The SVN homepage links an excellent book, including examples of
how to use "update". In any case, make a copy of your WC and try to get your
answer.

> 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.

Just for the record: There is a thing called "vendor branch", which basically
is used to track sources you just receive from a vendor and then modify
locally. SVN dedicates a chapter in its documentation and a very useful
script to managing those!

> 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.

As noticed elsewhere, this doesn't do what you think it does. If you want,
check out a second working copy and diff that with the sources you expect in
there.

Cheers!

Uli

-- 
ML: http://tortoisesvn.tigris.org/list_etiquette.html
FAQ: http://tortoisesvn.net/faq
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
           Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2678646
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-11-04 09:02:49 CET

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