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

Re: Repeated merges--anybody got any working scripts for merging?

From: <ttimo_at_idsoftware.com>
Date: 2003-01-04 22:37:35 CET

I wrote, and I'm using quite intensively a script for vendor branches
that I wrote (in perl). It's pretty specific to my situation though,
where I have to manage an svn with vendor branches coming from a Source
Offsite server. This was originally written for CVS (and still works for
CVS), and I extended it to support SVN recently.

I am really unsure what use this code could be to you though. Most of it
is eavily dependent on the SOS command line client specifics, I doubt
you could even get it to work without an account on a test SOS
repository.

If you are still interested though, I can cleanup the files into a
public release.

regards

TTimo

On Sat, Jan 04, 2003 at 06:46:34PM +0000, Robert North wrote:
> I've been following the threads on merging as best I can,
> I've head a few people talking about building/using some scripts to
> manage branches,
> but no sign of anything beyond deisgn discussion.
>
> I now find myself in a situation where I may need some merge management
> tool soon.
>
> Before I plunge in and build my own scripts, I want to check if anyone
> else has developed merge tools
> that are close to my rquirements.
>
> My requirements:
> I am running subversion as a single user, and tracking a CVS
> repository.
> I intend to use branches to manage my patches against the vendor
> branch, and also to manage my experimental changes that
> may or may not become part of a patch.
>
> Therefore I need to manage the transfer of changes from vendor
> branch to my main branch, and experimental branch.
> Also I need to do merges to and from the main branch, and any
> experimental branch.
>
> To this end, I have already got a design for a branch management system
> that has the following
> specification:
>
> 1. It is not designed for a multi-user environment, so may
> have transaction issues.
> 2. Only directories can be branched.
> 3. Branches must be created by special script. This marks,
> for a given directory, the copy and it's original as being managed branches.
> 4. A branched directory cannot contain branched sub-directories.
> 5. A branched directory can be further branched at any time.
> 6. Branches must be merged by a specal merge script, to
> replace "svn merge"
> 7. The merge script only works on the head revision of branches.
> 7. The merge script has no provision for managing merges to
> undo a set of revisions.
> 8. The mergescript may merge from any branch, to any other
> branch.
> 9. The branch create script only works on the head revision
> of branches.
> 10. Foolhardy use of "svn cp" and "svn merge" will be able to
> defeat the automation provided by the branch and merge scripts.
>
>
> If anyone knows of any scripts that implement part, all, or more of
> these features I'd be extremely interested.
>
> If anyone's interested, I could also post my design for the script on
> this list.
>
> Many thanks
> -Rob.
>
>
>
>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jan 4 22:40:47 2003

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