[FFmpeg-soc] E-AC3 decoder, version control

[Michael Niedermayer]

On Sun, Dec 09, 2007 at 06:20:02PM -0500, Justin Ruggles wrote:
[...]
> >> I guess another option would be to go back and "rebase" by manually 
> >> applying each change since the snapshot and resolving any conflicts. 
> >> That's pretty labor-intensive though, and it still doesn't make things 
> >> any easier when it comes time to merge into FFmpeg SVN since I can't go 
> >> back and insert the changes at the beginning.  I would sort of have to 
> >> recreate the file histories, resolving each conflict one at a time, on 
> >> top of the current versions. Yikes.
> >>
> >> Any thoughts?
> > 
> > i really have lost track of all the changes in public and non public branches
> > and repos of the ac3 code and cant comment on vague changes i dont see
> > please use the words ffmpeg-svn soc-svn private-git? and revission numbers
> > if possible. so i can take a look at what you are speaking about
> 
> Sorry, what I'm getting at is that what is in soc-svn is a mix of new 
> files and files which are already in ffmpeg-svn.  The duplicated files 
> in soc-svn were taken as a snapshot at r10002, then modified, but are 
> not current, by about 10 commits or so.

the files in ffmpeg-svn could be reverted to r10002 with svn cp and then all
the changes applied, iam not saying we should do that but we could ...


> 
> > and what i can say is that what will be applied to ffmpeg-svn will have to
> > pass reveiw and smaller and clean patches will be significantly less
> > work for all involved
> 
> Indeed.
> 
> > iam not insisting on the true history from soc if its difficult to preserve
> 
> Great, then the changes to existing files can be split into logical 
> patches for inclusion rather than trying to keep their histories from 
> soc-svn.  

yes


[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The worst form of inequality is to try to make unequal things equal.
-- Aristotle
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-soc/attachments/20071210/2b5fc4a4/attachment.pgp>