Re: Managing Debian packages with Subversion

2003-08-30 Thread Jamin W. Collins
On Sat, Aug 30, 2003 at 12:33:29AM +0200, Eduard Bloch wrote: > #include > * Jamin W. Collins [Fri, Aug 29 2003, 03:13:44PM]: > > > What _stupidness_ are you refering to? I've always just used something > > like: > > > >svn merge http://pkg/upstream/a.b http://pkg/upstream/current trunk >

Re: Managing Debian packages with Subversion

2003-08-29 Thread Joey Hess
Eduard Bloch wrote: > However, a possible implementation failed completely because of > stupideness of "svn merge". So we have to find an alternative solution > with diff&patch&cp. OTOH it is not possible to keep the version history of > every file. I think you're looking for svn_load_dirs. -- s

Re: Managing Debian packages with Subversion

2003-08-29 Thread Eduard Bloch
#include * Jamin W. Collins [Fri, Aug 29 2003, 03:13:44PM]: > What _stupidness_ are you refering to? I've always just used something > like: > >svn merge http://pkg/upstream/a.b http://pkg/upstream/current trunk Always? Nice to see that it can work with three arguments and apply the change

Re: Managing Debian packages with Subversion

2003-08-29 Thread Jamin W. Collins
On Fri, Aug 29, 2003 at 10:30:46PM +0200, Eduard Bloch wrote: > > Question: how do you manage upstream and Debian branches? I encounter > this problem while trying to find the best concept for svn-uupdate. > > The first idea was: > > branches/upstream/a.b ---> branches/ups

Re: Managing Debian packages with Subversion

2003-08-29 Thread Eduard Bloch
#include * Joey Hess [Fri, Aug 29 2003, 12:35:46PM]: > Actually, dpkg-buildpackage does not care what you name the build > directory of a package. > > Persaonally, I use just packagename for the directory names and build > directly from them, using a collection of ugly hacks to ignore the .svn >

Re: Managing Debian packages with Subversion

2003-08-29 Thread Joey Hess
Eduard Bloch wrote: > However, a possible implementation failed completely because of > stupideness of "svn merge". So we have to find an alternative solution > with diff&patch&cp. OTOH it is not possible to keep the version history of > every file. I think you're looking for svn_load_dirs. -- s

Re: Managing Debian packages with Subversion

2003-08-29 Thread Eduard Bloch
#include * Jamin W. Collins [Fri, Aug 29 2003, 03:13:44PM]: > What _stupidness_ are you refering to? I've always just used something > like: > >svn merge http://pkg/upstream/a.b http://pkg/upstream/current trunk Always? Nice to see that it can work with three arguments and apply the change

Re: Managing Debian packages with Subversion

2003-08-29 Thread Jamin W. Collins
On Sat, Aug 30, 2003 at 12:33:29AM +0200, Eduard Bloch wrote: > #include > * Jamin W. Collins [Fri, Aug 29 2003, 03:13:44PM]: > > > What _stupidness_ are you refering to? I've always just used something > > like: > > > >svn merge http://pkg/upstream/a.b http://pkg/upstream/current trunk >

Re: Managing Debian packages with Subversion

2003-08-29 Thread Jamin W. Collins
On Fri, Aug 29, 2003 at 12:30:46PM -0400, Joey Hess wrote: > Fabian Fagerholm wrote: > > * B.B. svn_load_dirs -t tags/projectX/upstream/ > >url://host/repos/ branches/projectX/upstream > >/path/to/new/version > > I've only ever had to do this once, and

Re: Managing Debian packages with Subversion

2003-08-29 Thread Joey Hess
Jamin W. Collins wrote: > I was with you up to this point. I don't normally name my working copy > in the form project- as that form is needed for actually making > hte package and for that we need an exported copy of the working copy. Actually, dpkg-buildpackage does not care what you name the b

Re: Managing Debian packages with Subversion

2003-08-29 Thread Joey Hess
Fabian Fagerholm wrote: > Thanks to [EMAIL PROTECTED] and [EMAIL PROTECTED] for their > insight into this issue. I will try to summarize everything in this > reply to myself. Nice job writing this up, here are some corrections. > The repository will have the following structure: > > trun

Re: Managing Debian packages with Subversion

2003-08-29 Thread Eduard Bloch
#include * Joey Hess [Fri, Aug 29 2003, 12:35:46PM]: > Actually, dpkg-buildpackage does not care what you name the build > directory of a package. > > Persaonally, I use just packagename for the directory names and build > directly from them, using a collection of ugly hacks to ignore the .svn >

Re: Managing Debian packages with Subversion

2003-08-29 Thread Jamin W. Collins
On Fri, Aug 29, 2003 at 10:30:46PM +0200, Eduard Bloch wrote: > > Question: how do you manage upstream and Debian branches? I encounter > this problem while trying to find the best concept for svn-uupdate. > > The first idea was: > > branches/upstream/a.b ---> branches/ups

Re: Managing Debian packages with Subversion

2003-08-29 Thread Eduard Bloch
#include * Fabian Fagerholm [Fri, Aug 29 2003, 12:44:02PM]: > On Thu, 2003-08-28 at 22:24, Fabian Fagerholm wrote: > > How do I manage a new Debian package with Subversion? > > Thanks to [EMAIL PROTECTED] and [EMAIL PROTECTED] for their > insight into this issue. I will try to summarize everythin

Re: Managing Debian packages with Subversion

2003-08-29 Thread Jamin W. Collins
On Fri, Aug 29, 2003 at 12:44:02PM +0300, Fabian Fagerholm wrote: > > * Check out the trunk you just created into a directory called > project- (svn co). I was with you up to this point. I don't normally name my working copy in the form project- as that form is needed for actually m

Re: Managing Debian packages with Subversion

2003-08-29 Thread Jamin W. Collins
On Thu, Aug 28, 2003 at 10:24:57PM +0300, Fabian Fagerholm wrote: > > How do I manage a new Debian package with Subversion? > > The things I've found only scratch the surface a bit, assume a level > of knowledge beyond mine, or assume you're migrating from CVS and > already have made several init

Re: Managing Debian packages with Subversion

2003-08-29 Thread Jamin W. Collins
On Fri, Aug 29, 2003 at 12:30:46PM -0400, Joey Hess wrote: > Fabian Fagerholm wrote: > > * B.B. svn_load_dirs -t tags/projectX/upstream/ > >url://host/repos/ branches/projectX/upstream > >/path/to/new/version > > I've only ever had to do this once, and

Re: Managing Debian packages with Subversion

2003-08-29 Thread Joey Hess
Jamin W. Collins wrote: > I was with you up to this point. I don't normally name my working copy > in the form project- as that form is needed for actually making > hte package and for that we need an exported copy of the working copy. Actually, dpkg-buildpackage does not care what you name the b

Re: Managing Debian packages with Subversion

2003-08-29 Thread Joey Hess
Fabian Fagerholm wrote: > Thanks to [EMAIL PROTECTED] and [EMAIL PROTECTED] for their > insight into this issue. I will try to summarize everything in this > reply to myself. Nice job writing this up, here are some corrections. > The repository will have the following structure: > > trun

Re: Managing Debian packages with Subversion

2003-08-29 Thread Eduard Bloch
#include * Fabian Fagerholm [Fri, Aug 29 2003, 12:44:02PM]: > On Thu, 2003-08-28 at 22:24, Fabian Fagerholm wrote: > > How do I manage a new Debian package with Subversion? > > Thanks to [EMAIL PROTECTED] and [EMAIL PROTECTED] for their > insight into this issue. I will try to summarize everythin

Re: Managing Debian packages with Subversion

2003-08-29 Thread Jamin W. Collins
On Thu, Aug 28, 2003 at 09:56:29PM -0400, Joey Hess wrote: > Jamin W. Collins wrote: > > I prefer an alternate structure where you start with the project as > > a top level. This keeps all project (package) related files under > > one directory in the project: > > > >project/ > > tru

Re: Managing Debian packages with Subversion

2003-08-29 Thread Joey Hess
Jamin W. Collins wrote: > I prefer an alternate structure where you start with the project as a > top level. This keeps all project (package) related files under one > directory in the project: > >project/ > trunk/ > branches/ > tags/ > vendor/ The only problem wit

Re: Managing Debian packages with Subversion

2003-08-29 Thread Fabian Fagerholm
On Thu, 2003-08-28 at 22:24, Fabian Fagerholm wrote: > How do I manage a new Debian package with Subversion? Thanks to [EMAIL PROTECTED] and [EMAIL PROTECTED] for their insight into this issue. I will try to summarize everything in this reply to myself. Managing Debian packages wi

Re: Managing Debian packages with Subversion

2003-08-29 Thread Fabian Fagerholm
On Thu, 2003-08-28 at 22:24, Fabian Fagerholm wrote: > How do I manage a new Debian package with Subversion? Thanks to [EMAIL PROTECTED] and [EMAIL PROTECTED] for their insight into this issue. I will try to summarize everything in this reply to myself. Managing Debian packages wi

Re: Managing Debian packages with Subversion

2003-08-29 Thread Jamin W. Collins
On Fri, Aug 29, 2003 at 12:44:02PM +0300, Fabian Fagerholm wrote: > > * Check out the trunk you just created into a directory called > project- (svn co). I was with you up to this point. I don't normally name my working copy in the form project- as that form is needed for actually m

Re: Managing Debian packages with Subversion

2003-08-29 Thread Jamin W. Collins
On Thu, Aug 28, 2003 at 09:56:29PM -0400, Joey Hess wrote: > Jamin W. Collins wrote: > > I prefer an alternate structure where you start with the project as > > a top level. This keeps all project (package) related files under > > one directory in the project: > > > >project/ > > tru

Re: Managing Debian packages with Subversion

2003-08-29 Thread Joey Hess
Jamin W. Collins wrote: > I prefer an alternate structure where you start with the project as a > top level. This keeps all project (package) related files under one > directory in the project: > >project/ > trunk/ > branches/ > tags/ > vendor/ The only problem wit

Re: Managing Debian packages with Subversion

2003-08-28 Thread Jamin W. Collins
On Thu, Aug 28, 2003 at 02:13:51PM -0600, Jamin W. Collins wrote: > > Yes, that way you have a source structure devoid of the .svn > subdirectories. I use the attached export script to ease the and build > process. It assumes it is run from the project directory and that the > orig source file a

Re: Managing Debian packages with Subversion

2003-08-28 Thread Jamin W. Collins
On Thu, Aug 28, 2003 at 10:24:57PM +0300, Fabian Fagerholm wrote: > > How do I manage a new Debian package with Subversion? > > The things I've found only scratch the surface a bit, assume a level > of knowledge beyond mine, or assume you're migrating from CVS and > already have made several init

Re: Managing Debian packages with Subversion

2003-08-28 Thread Jamin W. Collins
On Thu, Aug 28, 2003 at 02:13:51PM -0600, Jamin W. Collins wrote: > > Yes, that way you have a source structure devoid of the .svn > subdirectories. I use the attached export script to ease the and build > process. It assumes it is run from the project directory and that the > orig source file a