You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Jan Mönnich <Ja...@newtron.net> on 2004/12/03 10:03:18 UTC
Checksum error after Restore from Dump and svn switch --relocate
Hello,
I tried to restore my backup to check if my working copies are lost.
To restore I loaded the dumped backup files into a new repository:
cat backup/revision*.dump | svn admin load developer3
After the restore I took an old working copy and tried to switch it to the restored repository:
--- 8< ------------ 8< ------------ 8< ------------ 8< ------------ 8< ---------
d:test/tools> svn switch --relocate svn://hedwig/developer/trunk/java/tools svn://hedwig/developer3/branches/trading_5_3_nv/java/tools .
d:test/tools> svn up
G LastModifiedList.java
G Utils.java
G NewProperties.java
U debug\DebugMap.java
G BlobData.java
G ClobData.java
G threads\ProcessThreadPool.java
svn: Checksum mismatch for 'threads/.svn/text-base/PipeThread.java.svn-base'; expected: '4b3f73ecdac
a362458992d7ae712dbfc', actual: 'fbc33f1f5af4cd6349d4a788c767c554'
d:test/tools> svn cleanup
d:test/tools> svn up
D AsciiStringBuffer.java
D NewStringBuffer.java
svn: Checksum mismatch for 'threads/.svn/text-base/PipeThread.java.svn-base'; expected: '4b3f73ecdac
a362458992d7ae712dbfc', actual: 'fbc33f1f5af4cd6349d4a788c767c554'
d:test/tools>
--- 8< ------------ 8< ------------ 8< ------------ 8< ------------ 8< ---------
Im using svn 1.1.0 (r11180) at the server and the clients.
Is my working copy lost after a restore?
An update from the original repository works:
--- 8< ------------ 8< ------------ 8< ------------ 8< ------------ 8< ---------
d:java/tools> svn up
U CVSUtils.java
Updated to revision 28219.
--- 8< ------------ 8< ------------ 8< ------------ 8< ------------ 8< ---------
Or should I only relocate the repository base (hedwig/developer) instead of repository and branch (hedwig/developer/branches/trading_5_3_nv/java/tools)?
best regard,
jan moennich
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Checksum error after Restore from Dump and svn switch --relocate
Posted by Scott Palmer <sc...@2connected.org>.
On Dec 4, 2004, at 8:00 PM, Ben Collins-Sussman wrote:
>
> On Dec 4, 2004, at 5:20 PM, Max Bowsher wrote:
>>
>> "svn switch" and "svn switch --relocate" are *VERY* different. (In
>> retrospect, they should have been two different subcommands.) Run
>> "svn switch --help" for an explanation.
>>
>
> They're so different, in fact, we considered putting them into
> separate subcommands. Take a look at the end of the book -- the
> reference section on 'svn switch'. It has examples and more detailed
> explanation of the difference:
>
> http://svnbook.red-bean.com/en/1.1/re27.html
Ok, just to make sure I have this absolutely correct...
--relocated is used only to tell the working copy that the location
that corresponds to it in the repository has changed, but it is in fact
the same branch just with a new URL.
Whereas without --relocate you are telling the working copy to 'become'
a working copy of a different branch.
Is that it?
If that's generally correct, I guess the regular (non-relocating) 'svn
switch' updates the files in your working copy based on the differences
between the 'from' and 'to' branches, adding or removing the changes
that are part of the branch-to-branch diff, but leaving your local
changes.
I've only ever used the --relocate version, since I reorganized the
repository a couple times before I was comfortable with the layout.
In my case I was moving around the trunk of my project - (e.g.
trunk/Project to Project/trunk) so it remained in the same repository
but with a new path. I think --relocate was the correct thing to do in
that case (it didn't cause any problems). So when I read Max's
statement "relocating from one in-repos path (trunk) to another
(branches/trading_5_3_nv). Thats *very* bad." I was concerned.
Scott
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Checksum error after Restore from Dump and svn switch --relocate
Posted by Ben Collins-Sussman <su...@collab.net>.
On Dec 4, 2004, at 5:20 PM, Max Bowsher wrote:
>
> "svn switch" and "svn switch --relocate" are *VERY* different. (In
> retrospect, they should have been two different subcommands.) Run "svn
> switch --help" for an explanation.
>
They're so different, in fact, we considered putting them into separate
subcommands. Take a look at the end of the book -- the reference
section on 'svn switch'. It has examples and more detailed explanation
of the difference:
http://svnbook.red-bean.com/en/1.1/re27.html
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Checksum error after Restore from Dump and svn switch --relocate
Posted by Max Bowsher <ma...@ukf.net>.
Scott Palmer wrote:
> On Dec 3, 2004, at 2:35 PM, Max Bowsher wrote:
>
>> Jan Mönnich wrote:
>>> --- 8< ------------ 8< ------------ 8< ------------ 8< ------------ 8<
>>> --------- d:test/tools> svn switch --relocate
>>> svn://hedwig/developer/trunk/java/tools
>>> svn://hedwig/developer3/branches/trading_5_3_nv/java/tools .
>>
>> You relocated from one in-repos path (trunk) to another
>> (branches/trading_5_3_nv). Thats *very* bad. It's guaranteed to break
>> your WC.
>>
>> Ma.x
>>
>
> Could you explain this restriction? I was under the impression that I
> should do exactly that if I reorganize the repository and need to point
> an existing WC to the new location.
"svn switch" and "svn switch --relocate" are *VERY* different. (In
retrospect, they should have been two different subcommands.) Run "svn
switch --help" for an explanation.
Max.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Checksum error after Restore from Dump and svn switch --relocate
Posted by Scott Palmer <sc...@2connected.org>.
On Dec 3, 2004, at 2:35 PM, Max Bowsher wrote:
> Jan Mönnich wrote:
>> --- 8< ------------ 8< ------------ 8< ------------ 8< ------------ 8<
>> --------- d:test/tools> svn switch --relocate
>> svn://hedwig/developer/trunk/java/tools
>> svn://hedwig/developer3/branches/trading_5_3_nv/java/tools .
>
> You relocated from one in-repos path (trunk) to another
> (branches/trading_5_3_nv). Thats *very* bad. It's guaranteed to break
> your WC.
>
> Ma.x
>
Could you explain this restriction? I was under the impression that I
should do exactly that if I reorganize the repository and need to point
an existing WC to the new location.
Scott
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Checksum error after Restore from Dump and svn switch --relocate
Posted by Max Bowsher <ma...@ukf.net>.
Jan Mönnich wrote:
> Hello,
>
> I tried to restore my backup to check if my working copies are lost.
> To restore I loaded the dumped backup files into a new repository:
> cat backup/revision*.dump | svn admin load developer3
>
> After the restore I took an old working copy and tried to switch it to the
> restored repository:
>
> --- 8< ------------ 8< ------------ 8< ------------ 8< ------------ 8<
> ---------
> d:test/tools> svn switch --relocate
> svn://hedwig/developer/trunk/java/tools
> svn://hedwig/developer3/branches/trading_5_3_nv/java/tools .
You relocated from one in-repos path (trunk) to another
(branches/trading_5_3_nv). Thats *very* bad. It's guaranteed to break your
WC.
Ma.x
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org