[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
- To: alleg-developers@xxxxxxxxxx
- Subject: Re: [AD] Subversion
- From: Thomas Fjellstrom <tfjellstrom@xxxxxxxxxx>
- Date: Tue, 1 Nov 2005 07:07:26 -0600
- Domainkey-signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:from:to:subject:date:user-agent:references:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:message-id; b=gV2WXnuD4P0No1beX9F9XLwve2i0dIgP9vuptz+F5VLRvqzKg0HZiwpEJmUZcA52h4uUfozQXY3BnFvSV2zP06fUyCt3dh9Z6gI7PcEwFe3E2UIqZmeXxzZ0nq8GC0WlviCyi7UR/VNe2MFKtfnGQ9yg/NySnYbaEQ67Ninecys=
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