[FreeNX-kNX] nxlibs 1.5.0 and FreeNX 0.4.x

[Henk Poley]

Op woensdag 13 juli 2005 03:58, schreef Kurt Pfeifle:
> On Wednesday 13 July 2005 01:47, Gian Filippo Pinzari wrote:
> > Kurt Pfeifle wrote:
> > > What is not so easy is to merge the big tarballs (or their diffs) back
> > > into SVN when there were lots of changes in the meanwhile.
> >
> > I don't think it's really difficult. Just let the SVN/CVS tools do that
> > for you.
>
> These tools are not designed to convert tarballs into SVN repository
> commits  ;-)

Hmm, what you can do is create a branch which follows the !M tarballs. Then 
`svn copy` that branch in your trunk and in there add your own 
'magic' (FreeNX code). Every time you unpack a new tarball and commit it you 
do a `svn merge` to your trunk afterwards, and check for failures .

> There will be some manual work involved.

Of course.

> But you are already scaring me with the "6-7 releases per day"  ;-)
> I for sure would not be able to set aside voluntary time to merge each
> and every of these releases back into a SVN repository...  ;-)

Those 7 'releases' probably differ only in small ways. Applying tiny diffs 
works most of the time. So if you can get !M to set up an rsync server (or 
pulling directly from anonymous CVS) you could probably automate it. Pull 
update into the branch, commit branch, svn merge to trunk, send mail if a 
patch breaks (and svn revert local trunk), commit trunk if all went correct.

	Henk Poley <><