[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Branching Questions

From: Lieven Govaerts <lgo_at_mobsol.be>
Date: 2006-02-10 22:35:47 CET

Phil,

if you have a lot of changes between your starting point and the newer
version ( added/deleted files and folders ), this is a possible solution:

Supposing you imported your starting point to trunk in revision 1.

- create a branch from trunk@5
- checkout that branch to a working copy, make sure you also have a copy of
the new code on your disk.
- use the svn_load_dirs.pl script in the subversion repository (
http://svn.collab.net/viewcvs/svn/trunk/contrib/client-side/ ) to import the
new code to your working copy. The script will copy over all files, add and
delete files and folders and even allow you to indicate files to be renamed.
- the script will commit the working copy automatically

You now have a branch with one committed revision. This revision contains
the exact delta between your starting point and the new code. The only thing
left to do is to merge that revision to trunk.

Lieven.

> -----Original Message-----
> From: Phillip Novess [mailto:pnovess@mac.com]
> Sent: vrijdag 10 februari 2006 20:53
> To: users@subversion.tigris.org
> Subject: Branching Questions
>
> Hello,
>
> I started a repository and I found that the starting point of
> my repository, the code I was working on, started at an
> incompatible version with an upgrade I applied. So there are
> changes that have made since the start of the repository. I'm
> only at rev 23.
>
> But I was wondering can I branch the current revision and
> import my new starting point at rev 24? Then start doing
> diffs to apply the changes I did in the previous revs. Does
> an import overwrite a repository?
>
> Any thoughts?
>
> thanks,
> - phill
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 10 22:44:31 2006

This is an archived mail posted to the Subversion Users mailing list.