If you added an 'extra' revision to the svnsync target repository (by doing a wiki-commit), then the only thing you can do is completely reset the target repository to revision 0 (empty) and restart svnsync from the beginning.
On Thu, Jun 10, 2010 at 9:53 AM, Adam <[email protected]> wrote: > Hi, I recently svnsync'd my local repository to google code. I then > edited the wiki and unwittingly broke svnsync's ability to sync. Is > there any way for me to re-sync my google code repository now? I've > tried the workaround listed on some blogs: > svn propset --revprop -r0 svn:sync-last-merged-rev 851 > https://myrepo.googlecode.com/svn > but still get the error: > svnsync: Revision being currently copied (853), last merged revision > (851), and destination HEAD (852) are inconsistent; have you committed > to the destination without using svnsync? > > 851 is the last version I successfully committed using svn, 852 is the > current version with a wiki edit, and 857 is the current local version > I'm trying to sync to googlecode. > > If I try this: > svn propset --revprop -r0 svn:sync-last-merged-rev 852 > https://myrepo.googlecode.com/svn > I get a useless error message: > Transmitting file data .svnsync: General svn error from server > which I assume means it's failing because it's trying to sync two > commits that are not the same. > > I've read that it is possible to restore the repository from svn dump, > but last time that took about 8 hours, so I'd like to find an > alternative if possible. > > Thanks, > Adam > > -- > You received this message because you are subscribed to the Google Groups > "Project Hosting on Google Code" group. > To post to this group, send email to [email protected]. > To unsubscribe from this group, send email to > [email protected]. > For more options, visit this group at > http://groups.google.com/group/google-code-hosting?hl=en. > > -- You received this message because you are subscribed to the Google Groups "Project Hosting on Google Code" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/google-code-hosting?hl=en.
