You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by cleaner416 <cl...@mac.com> on 2006/03/05 05:01:30 UTC
Restoring from older backup, how to sync again?
Greetings,
Recently the hard disk containing my code repositories crashed and I had to
restore from a 1 week old backup. On a development machine I have made
several changes to a couple of repositories and committed them during the
week. So I still have the lastest code on my client machine, but the
repository on the svn server is a week old. So now I have a situation like
this:
Development machine: has revision #45, doesn't think a commit is needed (I
committed right before the server HD crash)
Server that lost a week of commits has revision #40
What's the best approach to re-sync here? I don't mind missing 41-44, but
I'm hoping there is a solution where I can resync without simply blowing
away the project and starting at rev 1 again with the latest source.
Many thanks!
--
View this message in context: http://www.nabble.com/Restoring-from-older-backup%2C-how-to-sync-again--t1227321.html#a3245898
Sent from the Subversion Users forum at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Restoring from older backup, how to sync again?
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Mar 5, 2006, at 06:01, cleaner416 wrote:
> Recently the hard disk containing my code repositories crashed and
> I had to
> restore from a 1 week old backup. On a development machine I have
> made
> several changes to a couple of repositories and committed them
> during the
> week. So I still have the lastest code on my client machine, but the
> repository on the svn server is a week old. So now I have a
> situation like
> this:
>
> Development machine: has revision #45, doesn't think a commit is
> needed (I
> committed right before the server HD crash)
> Server that lost a week of commits has revision #40
>
> What's the best approach to re-sync here? I don't mind missing
> 41-44, but
> I'm hoping there is a solution where I can resync without simply
> blowing
> away the project and starting at rev 1 again with the latest source.
Here's the solution I posted awhile ago to someone else's similar
problem:
http://svn.haxx.se/users/archive-2005-08/0347.shtml
Note that this does not address adding or deleting files, which
you'll have to take care to handle separately.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Restoring from older backup, how to sync again?
Posted by Andy Levy <an...@gmail.com>.
On 3/5/06, cleaner416 <cl...@mac.com> wrote:
> Recently the hard disk containing my code repositories crashed and I had to
> restore from a 1 week old backup. On a development machine I have made
> several changes to a couple of repositories and committed them during the
> week. So I still have the lastest code on my client machine, but the
> repository on the svn server is a week old. So now I have a situation like
> this:
>
> Development machine: has revision #45, doesn't think a commit is needed (I
> committed right before the server HD crash)
> Server that lost a week of commits has revision #40
>
> What's the best approach to re-sync here? I don't mind missing 41-44, but
> I'm hoping there is a solution where I can resync without simply blowing
> away the project and starting at rev 1 again with the latest source.
I think what I've seen recommended around here is to check out a fresh
WC from the repository (erv 40), then copy your changed files from the
old WC to the one you just created, then commit rev 41.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Restoring from older backup, how to sync again?
Posted by Nico Kadel-Garcia <nk...@comcast.net>.
cleaner416 wrote:
> Greetings,
>
> Recently the hard disk containing my code repositories crashed and I
> had to restore from a 1 week old backup. On a development machine I
> have made several changes to a couple of repositories and committed
> them during the week. So I still have the lastest code on my client
> machine, but the repository on the svn server is a week old. So now
> I have a situation like this:
>
> Development machine: has revision #45, doesn't think a commit is
> needed (I committed right before the server HD crash)
> Server that lost a week of commits has revision #40
>
> What's the best approach to re-sync here? I don't mind missing
> 41-44, but I'm hoping there is a solution where I can resync without
> simply blowing away the project and starting at rev 1 again with the
> latest source.
Read the manuals at http://svnbook.red-bean.com/nightly/en/svn-book.html,
and the part about "General Vendor Branch Management Procedure". There's
also a tool available called svn_load_dirs.pl which that manual recommends.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org