[Ffmpeg-devel] switch to svn

[Joshua Varner]

On 10/30/05, matthieu castet <castet.matthieu at free.fr> wrote:
> Attila Kinali wrote:
> >
> >>* merging stuff, so for example we can import the cvs or svn of lets say
> >>libmpeg2 into mplayer while preserving the history, with cvs thats easy
> >
> >
> > I dont know whether it is possible to merge svn repos into
> > svn, but it's possible with cvs repos, given that the repo files
> > are available.
> >
> I think he wants something like cp :
>
> copy (cp): Duplicate something in working copy or repository,
> remembering history.
> usage: copy SRC DST
>
>    SRC and DST can each be either a working copy (WC) path or URL:
>      WC  -> WC:   copy and schedule for addition (with history)
>      WC  -> URL:  immediately commit a copy of WC to URL
>      URL -> WC:   check out URL into WC, schedule for addition
>      URL -> URL:  complete server-side copy;  used to branch & tag
>

You cannot svn cp between repositories, but if you want to merge two
repositories it is possible. You dump both repositories to dump files,
then merge them with the ReposMerge script (svndumpfilter will allow
you to change the pathnames in either repos before merging), then
load the merged file into a new repository.

Currently this operation has to be done with command line tools, while
the repository is unavailable. You could just load the other repository
into the current one, but that breaks data based commands, Repos
merge will interleave the commits from the two repositories so that
date ordering is preserved. It is more complex to do with svn, but that's
b/c svn versions the trees, not just the files.

See this thread:
http://subversion.tigris.org/servlets/BrowseList?list=users&by=thread&from=364510

Josh