[FFmpeg-devel] [RFC] libswscale into the FFmpeg SVN repo
Sun Apr 5 03:21:49 CEST 2009
----- Original Message ----
> From: Christian Iversen <chrivers at iversen-net.dk>
> To: FFmpeg development discussions and patches <ffmpeg-devel at mplayerhq.hu>
> Sent: Sunday, 5 April, 2009 1:36:28
> Subject: Re: [FFmpeg-devel] [RFC] libswscale into the FFmpeg SVN repo
> Michael Niedermayer wrote:
> > On Sat, Apr 04, 2009 at 10:55:54PM +0200, Diego Biurrun wrote:
> >> On Sat, Apr 04, 2009 at 10:52:03PM +0200, Michael Niedermayer wrote:
> >>> On Sat, Apr 04, 2009 at 08:44:51PM +0200, Christian Iversen wrote:
> >>> [...]
> >>>>>> I've never used CVS a lot - what kind of support did it have for moving stuff between reposes?
> >>>>> you just copy the rcs files on the server, needs an account or someone
> >>>>> with an account ...
> >>>>> what was missing was that this didnt keep track of where the file previously
> >>>>> was ...
> >>>> Oh, like that. Yes, that was pretty neat. It's still perfectly possible with SVN though.
> >>> only as long as inside the same repo, cvs never had this limitation, a
> >>> rcs file form one repo can be copied to another like just copying it within a
> >>> repo
> >> And then that file magically appears in checkouts from dates before you
> >> moved the file, great idea.
> > Thats what i was speaking about, did you read it at all?
> > What my "suggestion" was, was that each RCS file would also keep track of the
> > path, not just the file content so past checkouts would not contain the
> > file in the wrong repo
> >> Per-file revision control is not a good idea. What you want to version
> >> is the whole repository.
> > thank you, but i know what i want. And the per repo version is why we cant
> > merge swscale into ffmpeg, with per file we could
> Well, that's not entirely true. With your system, it would be dangerous to
> simply move files into the new repos, because there could suddenly be a temporal
> overlap between the files. There could be several files with the same name at
> the same time, etc. Therefore, you would still need a special tool to do this.
> With SVN, this is checked by the merge tool, which allows you to rename the old
> repos into /new/branch. Such a tool would be needed for your system too.
> -- Med venlig hilsen
> Christian Iversen
Forgive me if this sounds illogical or wrong, but could you not do an SVN to GIT merge/conversion for the swscale branch, another separate one for the main ffmpeg branch, then do a GIT > GIT merge, thus keeping the revision data? I was under the impression from reading the GIT Wiki that it was capable of this.
More information about the ffmpeg-devel