Re: Debian packaging with git and conflicts resolution

2008-11-19 Thread Nicolas Duboc
On Tue, Nov 18, 2008 at 04:22:08PM -0800, Russ Allbery wrote: > The tmp-merge branch doesn't have this problem > since it's branched off upstream and doesn't have your old B and C > branches merged, and by the time you merge tmp-merge into master, you have > all of your conflicts resolved already a

Introductory mail

2008-11-19 Thread Sam Liddicott
I've been using CVS, SVN, QUILT and GIT over 10 years. I'm lately playing with building rpm's from GIT and SVN repositories. I have a nice set of scripts called make-srpm (with a git helper and a less mature svn helper). The scripts will export a "pristine" source and a set of patches from the a

Re: Introductory mail

2008-11-19 Thread Bruno Cornec
Sam Liddicott said on Wed, Nov 19, 2008 at 02:33:09PM -: > I'm lately playing with building rpm's from GIT and SVN repositories. You may find what I'm doing around project-builder interesting then. I'd be happy to receive feedbacks ... and contributions ;-) Cf: http://trac.project-builder.or

Re: Introductory mail

2008-11-19 Thread Sam Liddicott
* Bruno Cornec wrote, On 19/11/08 14:37: > Sam Liddicott said on Wed, Nov 19, 2008 at 02:33:09PM -: > > >> I'm lately playing with building rpm's from GIT and SVN repositories. >> > > You may find what I'm doing around project-builder interesting then. I'd > be happy to receive feedback

Re: Introductory mail

2008-11-19 Thread Bruno Cornec
Sam Liddicott said on Wed, Nov 19, 2008 at 02:45:13PM -: > Yes that is interesting, I think there could be a lot of overlap. I also thought so ;-) > Maybe the package maintainer could have their own git branch with the > distro's extra patches in it. Indeed. The way I use it myself is with

Re: Introductory mail

2008-11-19 Thread Philipp
Hi Sam, Sam Liddicott wrote: > err how shall I post it for comment? > If it's not too long, just attach the plain bash script to a mail here. Otherwise maybe just post it in the wiki at http://vcs-pkg.org/ ? Or does it need a lot of supporting infrastructure ? Bye, Philipp _

Re: Introductory mail

2008-11-19 Thread Sam Liddicott
* Philipp wrote, On 19/11/08 15:36: > Hi Sam, > > Sam Liddicott wrote: >> err how shall I post it for comment? > > If it's not too long, just attach the plain bash script to a mail here. > Otherwise maybe just post it in the wiki at http://vcs-pkg.org/ ? I can create new wiki pages, how do I ad