Simon,
Thank you so much! I did it according what you said. It works
fabulously now!
Best Regards
Li Aishen
On Oct 20, 4:59 pm, Simon Large <simon.tortoise..._at_gmail.com> wrote:
> On 20 October 2010 19:53, Li Aishen <lyndali..._at_gmail.com> wrote:
>
>
>
>
>
> > We were in the process of moving our server from our hosting company
> > to one of our local machines, unfortunately the local machine has
> > driver issue need to be fixed and our service with the hosting company
> > is terminated. Reset the server in this local machine will not be done
> > in any near future. So I cannot access the repository now. This
> > repository is in revision 78, and my local working copy sync with it.
> > Before moving the server, I made a copy of the repository with
> > revision 77 to another working local machine. Based on the situation,
> > I would like to use this repository with revision 77 in the working
> > local machine in future, but I had been working on my local working
> > copy with revision number 78 and made substantial changes.
>
> > How to reconcile my current working-copy with revision number 78 to
> > this repository with revision 77? What steps should I take?
>
> > My first failed try was to use tortoise-svn's switch to change url:
> >http://97.88.122.184:80/svn/trunk, however, this give me error like:
>
> > Error: OPTIONS of 'http://xx.xx.xxx.173:80/svn/trunk':could not
> > connect to server (http://xx.xx.xxx.173:80)
>
> > I know that the urlhttp://xx.xx.xxx.173:80is not live. Is there a
> > way to escape this?
>
> Assume that your original WC is in c:\projects\wc
>
> First move your working copy to a temporary directory, say c:\temp\wc.
>
> If your working copies has changes relative to r78 then make a second
> copy of it exactly as it is, say c:\temp\wc-changed. If the WC is a
> clean r78 then you can omit this step.
>
> Now checkout a fresh WC from your r77 repository into the original
> location, c:\projects\wc, giving you an r77 WC which is connected to a
> repository.
>
> If there were changes relative to r78 then you need to revert them in
> c:\temp\wc to make it a clean r78 (be sure your backup copy is still
> there with the changes in place).
>
> Now right drag the clean r78 WC in \temp onto c:\projects and choose
> Export versioned items here. You will get a message warning you that
> the directory already exists. Choose the overwrite option. This will
> copy the files which were changed by r78 over the top of your r77
> working copy.
>
> Now commit the changes, and your repository is at r78.
>
> If you also have changes relative to r78 to incorporate you need to do
> the same again. This time rename c:\temp\wc to c:\temp\wc-78 and
> rename c:\temp\wc-changed to c:\temp\wc (the renaming bit is because
> you want the folders to have the same name so that the new one
> overwrites the old). Again right drag over c:\projects and export. You
> now have an r78 WC with your latest changes, ready to commit.
>
> Simon
>
> --
> : ___
> : oo // \\ "De Chelonian Mobile"
> : (_,\/ \_/ \ TortoiseSVN
> : \ \_/_\_/> The coolest Interface to (Sub)Version Control
> : /_/ \_\ http://tortoisesvn.net
>
> ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2673998
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-10-21 02:30:41 CEST