Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 May 2013 16:41:14 -0500
From:      Dan Lists <lists.dan@gmail.com>
To:        freebsd-questions <freebsd-questions@freebsd.org>
Subject:   svnsync and local changes
Message-ID:  <CAPW8bZ3MVEQBdLZtQj=X=RMtzYFwrdcEQ67sCMb9kfjqpeCY4A@mail.gmail.com>

next in thread | raw e-mail | index | archive | help
Back when cvsup was in use, I mirrored the ports with cvsup-mirror.  Then I
could add files and make changes.  My servers used my repository so they
always had my changes and I only had to do them once.

I am trying to replicate the same setup now that subversion is used.  I've
set up svnsync, and that works fine.  I was able to add files with 'svn
add' and 'svn commit'.  My servers properly download all the new files.
The problem is I can no longer use svnsync.  Now it gives me "Destination
HEAD (316955) is not the last merged revision (316951)."    I've tried
removing my files with 'svn rm', but that just changes the number in the
error.   Is there some way to get this to work with svnsync?

Is there a better way for me to have a local repository that includes local
changes?

Thanks,

Dan



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPW8bZ3MVEQBdLZtQj=X=RMtzYFwrdcEQ67sCMb9kfjqpeCY4A>