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

Re: Vacation from the Subversion project

From: <kfogel_at_collab.net>
Date: 2005-05-23 22:01:17 CEST

"Jostein Chr. Andersen" <jostein@josander.net> writes:
> > Karl: The 1.2.x branch should probably just be committed to trunk
> > (there have been no changes to the files concerned since 1.2.x
> > forked). At that point, the existing branch becomes a standard
> > temporary backport branch. (Branch necessary due to some renaming on
> > trunk).
>
> Agree, +1 on committing it to the trunk. The uninstall capabilities of
> the Windows installer is broken without it. This fixes is already
> included in svn-1.2.0-rc4-setup.exe (had to do what it takes in order to
> deliver a working installer) and everyone seems to be happy about it; I
> don't know how many downloads the rc4 got (the stats.tigris.org is not
> updated anymore), but it's probably many thousands; in other words:
> tried and tested.

Okay. I tried to do the merge, and got this error:

   $ svn info
   [...]
   URL: http://svn.collab.net/repos/svn/trunk
   [...]
   $ svn merge -r14707:14716 \
     http://svn.collab.net/repos/svn/branches/innosetup-hsuninsfix-5x-1.2.x .
   Skipped missing target: 'packages/win32-innosetup/svn.iss'
   Skipped missing target: 'packages/win32-innosetup'
   $

In the trunk, it's 'windows-innosetup' instead of 'win32-innosetup'.
Should I make trunk naming reflect branch? Or just manually adjust
the patch to apply to trunk, which would be equally easy. Let me
know. I'm happy to take care of it, just need a little guidance.

Thanks,
-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon May 23 22:39:10 2005

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