Re: [AD] Subversion

[ Thread Index | Date Index | More lists.liballeg.org/allegro-developers Archives ]


On November 1, 2005 05:07 am, Peter Wang wrote:
> On 2005-11-01, Elias Pschernig <elias@xxxxxxxxxx> wrote:
> > On Tue, 2005-11-01 at 12:26 +1100, Peter Wang wrote:
> > > Hi,
> > >
> > > I would really like to migrate to Subversion ASAP, after 4.2.0 is out.
> > > The 4.3 source needs reorganising so that is it more obviously
> > > stratified and modular.  Files need to be renamed and moved about but I
> > > don't want to lose the histories doing that.  And hopefully SVN would
> > > be smarter at merging after renames than CVS (anyone know?)
> >
> > A rename is handled like any other change to a file. So if you merge
> > changes, and the changes include a file rename, also the file rename is
> > merged. If you merge only over revisions which had no file rename, then
> > you get no file name change.
>
> I'm thinking of the situation where the 4.2.0 branch has a file called
> src/something.c but in the new_api_branch it's been moved to
> src/module/something.c.  I would like if changes to one could be merged
> into the other, even though they no longer have the same path.

As far as I know, all history is kept through a name change. Oh, and there's a 
handy script to import a CVS tree into SVN, which basically keeps all of the 
CVS history, tags, trees, etc.

> -------------------------------------------------------
> This SF.Net email is sponsored by the JBoss Inc.
> Get Certified Today * Register for a JBoss Training Course
> Free Certification Exam for All Training Attendees Through End of 2005
> Visit http://www.jboss.com/services/certification for more information




Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/