Merging 2 divergent copies of the same repository.
From: David Wilson <dw_at_botanicus.net>
Date: Wed, 28 May 2008 19:51:39 +0100
[Please CC: dw_at_botanicus.net in replies, I am not subscribed]
Some time ago I made a copy of a personal repository on another host.
A year later, I now have 2 repositories with the same UUID and mostly
Thinking about the problem, I supposed I could use "svnadmin dump
B=file:///Users/dmw/dw_from_b/
svn log -vr $FIRST_DIVERGENT_REV:HEAD $B|grep '^ [A-Z] /'|cut
This builds a list of files changed in the two repositories, then uses
So my thinking is that this should work fine:
svnadmin dump --incremental -r 661:HEAD dw_from_b | svnadmin load dw
I tried this and it seems to work.
My question is: what sanity checks does svnadmin apply while loading
In my mind, what I have tested for (conflicting changes to files), and
Help!
Thanks,
David.
-- Science without religion is lame, religion without science is blind. — EinsteinReceived on 2008-05-29 08:44:33 CEST |
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.