subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Branko ─îibej <br...@wandisco.com>
Subject Re: Branch issue
Date Mon, 04 May 2015 17:56:29 GMT
On 04.05.2015 14:14, Jan De Luyck wrote:
> Hello folks,
>
> Perhaps a stupid subversion question, but one i haven't been able to
> figure out yet:
>
> I've got two scripts in the same directory, which are basically
> variants - one for RHEL6, one for RHEL7. Most of the content will be
> the same, with small changes here and there. The files are named
> according to the RHEL version.
>
> Unfortunatly the scripts have to be completely self-contained, so
> using modules/shared libraries/... is not an option.
>
> Ideally I'd like to only have to manage one script, and pull the
> changes into the second. But sofar I  haven't figured out a way yet to
> do this. The only thing I thought of is moving both to a separate dir,
> and branching one from the other. Doesn't seem ideal though.
>
> Any pointers/ideas how I could tackle this?

Any copy is a branch. It doesn't have to be a copy of a directory.
Therefore, you can take one file, make a copy of it, put the contents of
the second file in the copy, and from then on just "svn merge" into the
copy every time you change something in the master file.

-- Brane


Mime
View raw message