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

RE: [TSVN] Restoring a project to earlier revision[Scanned]

From: JS.staff <jsparrow_at_ecclescollege.ac.uk>
Date: 2004-07-21 12:34:40 CEST

Oh I see!!! I merge from 36 (junk) to 35 (good), not from 35 to 36!
 
Thanks for the help,
 
John

        -----Original Message-----
        From: Martin Tomes [mailto:lists@tomes.org]
        Sent: Wed 21/07/2004 10:30
        To: dev@tortoisesvn.tigris.org
        Cc:
        Subject: Re: [TSVN] Restoring a project to earlier revision[Scanned]
        
        

        JS.staff wrote:
        
> Thanks for the info.
>
> I'm new to all this, How do I merge two committed revisions like that? Can I merge without making working copies?
>
> Or should I just checkout a 'good' revision, then merge that with current head?
        
        You need to check out a working copy of the HEAD revision then do the merge to undo the changes
        which you don't want. Then you will have to resolve any conflicts and do a commit.
        
        --
        Martin Tomes
        echo 'martin at tomes x org x uk'\
          | sed -e 's/ x /\./g' -e 's/ at /@/'
        
        The Subversion Wiki is at http://www.subversionary.org/
        
        ---------------------------------------------------------------------
        To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
        For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
        
        

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

Received on Wed Jul 21 13:43:43 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.