On Fri, Jul 02, 2004 at 09:37:36PM +0200, Sylvain LE GALL wrote: > Hello, > > On Fri, Jul 02, 2004 at 05:57:28PM +0200, Sven Luther wrote: > > On Fri, Jul 02, 2004 at 10:36:53AM -0400, Michael Furr wrote: > > > On Fri, 2 Jul 2004, [iso-8859-1] J�r�me Marant wrote: > > > > BTW Mike, it seems you didn't update debian/copyright about compiler-libs, > > > > did you ? > > > > > > I added debian/ocaml-compiler-libs.copyright and o-c-l.README.Debian which > > > each have a note in them. I didn't think it was necessary to put it in > > > the main .copyright file since most people won't use the package anyway > > > and those who do, will hopefully look at its R.D or copyright before > > > using. However, if you think it should be there, go ahead and change it. > > > > It should be ok, i will upload it. Anyway, it will need to pass the NEW > > queue, so there is always time to make a new package. > > > > Now, what is the best practice to bring this tihng again in the main > > trunk ? Move the trunk out of the way, and svn mv the branch to the > > trunk ? Mike, you did a svn cp when you first created it, right ? > > > > Reading the svn book, i think you should use svn merge ! It will be > slower than svn rm / svn mv, but it is better ( regarding revision > system ). Since the trunk doesn't have made big changes since the fork > it should be easy !
Well, i moved the old trunk out of the way to branches/old, and then moved the x11-split branch to trunk. I belive this should have no influence on the history, since the x11-split branch is a direct descendent of the old trunk. I may be wrong about this. > If you want, i can do it... Just tell me If you would be so kind, no problem with that. Friendly, Sven Luther -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
