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

Re: restore repository - repository version?

From: <cmpilato_at_collab.net>
Date: 2003-08-13 23:42:29 CEST

Jani Averbach <jaa@cc.jyu.fi> writes:

> One dump question:
> >
> > $ cd working_copy
> > $ svn diff > ~/my-changes
>
> Is this comparing last pristine copy against local modifications,
> isn't?

Yep. So folks don't lose their local mods.

> What about if the pristine copy is from version 229 and the repository
> head is at 220.

That's why I have the folks simple move their old working copy out of
the way before checking out a new one, instead of destroying the old
working copy.

Surely, if someone has a revision-229 working copy, that person can
save the day by importing their working copy into a temporary location
of the new repository, then merging the diffs between the new HEAD of
trunk (which is basically revision 220) and their temp-repos-dir
(which is the no-longer-existant revision 229) into their new working
copy. You lose the individual changes between revisions 220 and 229
-- that is, they will all look like one big change in revision 221 --
but you don't lose the net change.

   $ svn import old_working_copy http://repos_url/temp_dir -m "Temp dir"
   $ svn merge http://repos_url/trunk http://repos_url/temp_dir working_copy
   $ svn ci -m "Changes from old repository revisions 221-229"
   $ svn rm http://repos_url/temp_dir -m "Remove the temp dir"

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 13 23:45:39 2003

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