Re: Using git-svn and gbp for DPMT - Was: Re: Joining the DPMT and git.debian.org access
On Tue, Jan 14, 2014 at 04:51:20PM +0100, Olivier Berger wrote: > Now, if you both want to track upstream sources from origin/master on > local upstream/ branch and svn's trunk on local master branch, then, > yes, a debian/gbp.conf comes handy, and you'll have to do nasty merges > now and then. git import-orig --filter=debian helps to avoid nasty merges, as long as you don't make changes to the upstream sources directly inside your packaging branch -- there shall be no conflicts if upstream does not touch debian and you do not touch the upstream sources. gbp-pq is also wonderful for maintaining quilt patch series. -- Kind regards, Loong Jin signature.asc Description: Digital signature
Re: Bug#735154: ITP: sockjs-twisted -- Simple library for adding SockJS support to a twisted application
On Tue, Jan 14, 2014 at 2:05 AM, Alexandre Rossi wrote: > Hi, > > On Mon, Jan 13, 2014 at 11:10 AM, Alexandre Rossi wrote: >> Package: wnpp >> Severity: wishlist >> Owner: Alexandre Rossi >> >> * Package name: sockjs-twisted >> Version : 1.2.1 >> Upstream Author : Christopher Gamble >> * URL : http://github.com/Fugiman/sockjs-twisted >> * License : BSD >> Programming Lang: Python >> Description : Simple library for adding SockJS support to a twisted >> application >> >> SockJS-Twisted passes all SockJS-Protocol v0.3.3 tests, and all >> SockJS-Client qunit tests. In addition to basic SockJS usage, it supports : >> - hosting multiple SockJS services off of one port, >> - offering of static resources, dynamic pages, and SockJS endpoints off of a >> single port, >> - multiplexing. > > FYI, preliminary package for review available[1]. > > I'll also be seeking sponsorship when git hosting is finalized (need > to be part of DPMT or hosting in collab-maint on alioth?). > > Regards, > > Alex > > [1] > http://sousmonlit.zincube.net/~niol/apt/pool/main/s/socksjs-twisted/socksjs-twisted_1.2.1-1~bpo70+1.dsc > Your initial package should not be a backport. Only packages that are currently in testing are eligible for a backport. Regards, -- Jordan Metzmeier -- To UNSUBSCRIBE, email to debian-python-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/CAD758RiG+d=2hjzhHs4rf10vTKjm4ZGz=64cfvhcwggnxh9...@mail.gmail.com
Re: Using git-svn and gbp for DPMT - Was: Re: Joining the DPMT and git.debian.org access
Barry Warsaw writes: > On Jan 14, 2014, at 02:40 PM, Olivier Berger wrote: > >>I've used git-buildpackage with git-svn on submodules of the DPMT SVN >>repo without too many difficulties so far. > > git-bp OTOH required a specific set of branches inside the repo to stitch > everything together and if those were missing, it failed miserably. I could > be totally wrong about that, or I could have just been using the tool > incorrectly. > It more or less requires only 2 branches : upstream (when you want to track upstream sources) and master (or debian) for the packaging source. But for repos of DPMT which won't track upstream code in the SVN, you only need to manage the debian/ subdir on the master branch which correspons to the trunk, so that means that git svn clone --std-layout basically sets things up for you. Now, if you both want to track upstream sources from origin/master on local upstream/ branch and svn's trunk on local master branch, then, yes, a debian/gbp.conf comes handy, and you'll have to do nasty merges now and then. In any case, reading http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.html more or less covers all the cases I've played with so far, AFAICT. YMMV ;-) Best regards, -- Olivier BERGER http://www-public.telecom-sudparis.eu/~berger_o/ - OpenPGP-Id: 2048R/5819D7E8 Ingenieur Recherche - Dept INF Institut Mines-Telecom, Telecom SudParis, Evry (France) -- To UNSUBSCRIBE, email to debian-python-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/877ga2v9xj@inf-8660.int-evry.fr
Re: Joining the DPMT and git.debian.org access
On 01/14/2014 08:24 AM, Alexandre Rossi wrote: > Hi, > >>> My goal is to maintain sockjs-twisted (#735154). >> >> the problem is... we don't use git, not yet at least (nobody had time to >> propose a transition) > > The Wiki page[1] suggests there are some git repositories, but I > cannot find/see them. I also found out that some packages maintained > by the team are hosted on alioth in collab-maint (src: bugz, > dajaxice). > > Regarding the transition, the Java packaging team has both git and svn > repositories. Maybe the DPMT can do the same starting with my package > in the path suggested by the Wiki. > > Advice? > > Alex > > [1] https://wiki.debian.org/Teams/PythonModulesTeam/ I'm a fan of a gradual transition like this, with people switching or setting up git repos as they can. .hc -- To UNSUBSCRIBE, email to debian-python-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/52d55342.5060...@at.or.at
Re: Using git-svn and gbp for DPMT - Was: Re: Joining the DPMT and git.debian.org access
On 01/14/2014 09:31 AM, Barry Warsaw wrote: > On Jan 14, 2014, at 02:40 PM, Olivier Berger wrote: > >> I've used git-buildpackage with git-svn on submodules of the DPMT SVN >> repo without too many difficulties so far. > > I need to spend more time playing with git-bp, but last time I looked at it > (cannot remember which package), I had a lot of trouble unless the package > repo was organized Just Right. One nice thing about svn-bp is that it pretty > much just works with a checked out working directory, even when you have local > uncommitted changes (--svn-ignore-new). > > git-bp OTOH required a specific set of branches inside the repo to stitch > everything together and if those were missing, it failed miserably. I could > be totally wrong about that, or I could have just been using the tool > incorrectly. > > I've mostly made my peace with git, so in theory I wouldn't be opposed to the > team switching, but I still think it's not a good idea to have some team > packages in git and the bulk in svn. I value the ability to use the same > tools and workflows for all team maintained packages. > > I'm not motivated enough to do any work on such a transition itself, so I > think those who really want to switch to git need to work out a plan. That > would include test repos, documentation updates, transition plans, educating > team members, fielding questions, fixing problems, etc. I would personally be > supportive, and would be willing to review material and test out recipes. But > I think this is going to require a few committed people to do some heavily > lifting over an extended period of time to make sure such a transition was > smooth and so that everyone on this team was comfortable with the new way of > doing things. > > That's just my opinion, of course. > -Barry I know what you mean about it having a brittle setup, but git-buildpackage has improved a lot over the past couple of years. One key thing that helps when using git-buildpackage in a team setting (pkg-multimedia is a good example) is having a standard debian/gbp.conf that configures everything in a standard way for that team. For example, it would be great to include a debian/gbp.conf that sets up the git-svn stuff and check that into svn projects. Then people can easily use git-buildpackage and still commit to svn repos. .hc -- To UNSUBSCRIBE, email to debian-python-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/52d55426.6030...@at.or.at
Re: Using git-svn and gbp for DPMT - Was: Re: Joining the DPMT and git.debian.org access
On Jan 14, 2014, at 02:40 PM, Olivier Berger wrote: >I've used git-buildpackage with git-svn on submodules of the DPMT SVN >repo without too many difficulties so far. I need to spend more time playing with git-bp, but last time I looked at it (cannot remember which package), I had a lot of trouble unless the package repo was organized Just Right. One nice thing about svn-bp is that it pretty much just works with a checked out working directory, even when you have local uncommitted changes (--svn-ignore-new). git-bp OTOH required a specific set of branches inside the repo to stitch everything together and if those were missing, it failed miserably. I could be totally wrong about that, or I could have just been using the tool incorrectly. I've mostly made my peace with git, so in theory I wouldn't be opposed to the team switching, but I still think it's not a good idea to have some team packages in git and the bulk in svn. I value the ability to use the same tools and workflows for all team maintained packages. I'm not motivated enough to do any work on such a transition itself, so I think those who really want to switch to git need to work out a plan. That would include test repos, documentation updates, transition plans, educating team members, fielding questions, fixing problems, etc. I would personally be supportive, and would be willing to review material and test out recipes. But I think this is going to require a few committed people to do some heavily lifting over an extended period of time to make sure such a transition was smooth and so that everyone on this team was comfortable with the new way of doing things. That's just my opinion, of course. -Barry -- To UNSUBSCRIBE, email to debian-python-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20140114093100.3da46...@anarchist.wooz.org
Re: Joining the DPMT and git.debian.org access
[Alexandre Rossi, 2014-01-14] > The Wiki page[1] suggests there are some git repositories I added the "TEST TEST TEST" part as soon as I noticed someone added it (I was hoping that a mail to this mailing list with more details will follow). I will remove it from wiki. > cannot find/see them. I also found out that some packages maintained > by the team are hosted on alioth in collab-maint (src: bugz, > dajaxice). I reported bug reports, thanks > Regarding the transition, the Java packaging team has both git and svn > repositories. Maybe the DPMT can do the same starting with my package > in the path suggested by the Wiki. https://lists.debian.org/debian-python/2013/02/msg00123.html -- Piotr Ożarowski Debian GNU/Linux Developer www.ozarowski.pl www.griffith.cc www.debian.org GPG Fingerprint: 1D2F A898 58DA AF62 1786 2DF7 AEF6 F1A2 A745 7645 -- To UNSUBSCRIBE, email to debian-python-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20140114135527.go4...@sts0.p1otr.com
Using git-svn and gbp for DPMT - Was: Re: Joining the DPMT and git.debian.org access
Hi. Alexandre Rossi writes: > Hi, > >>> My goal is to maintain sockjs-twisted (#735154). >> >> the problem is... we don't use git, not yet at least (nobody had time to >> propose a transition) > > The Wiki page[1] suggests there are some git repositories, but I > cannot find/see them. I also found out that some packages maintained > by the team are hosted on alioth in collab-maint (src: bugz, > dajaxice). > > Regarding the transition, the Java packaging team has both git and svn > repositories. Maybe the DPMT can do the same starting with my package > in the path suggested by the Wiki. > > Advice? > > Alex > > [1] https://wiki.debian.org/Teams/PythonModulesTeam/ > Maybe I can share a bit of help by explaining what I've tried to do for some recent contributions of mine. I've used git-buildpackage with git-svn on submodules of the DPMT SVN repo without too many difficulties so far. The command line is usually of this kind : $ gbp buildpackage [--git-verbose] --git-cleaner= --git-overlay --git-export-dir=../build-area/ --git-tarball-dir=../tarballs [--git-pbuilder] [-us -uc --git-ignore-new] This at least allows to work "offline" until the commit graph looks nice with git, and push (dcommit) to SVN when the package has been uploaded (or when you have a consistent state). This may also allow keeping in the same git repo an upstream clone together with the git-svn checkout. I think [0] may offer some more details on that topic. In a summary, we have SVN for some large scale operations and to please the dinausors^Waddicted ones, and the power of git for the comfort of the maintainer testing changes to the package locally. Hope this helps. Best regards, [0] http://honk.sigxcpu.org/con/Using_git_svn_and_git_buildpackage_to_build_packages_maintained_in_Subversion.html -- Olivier BERGER http://www-public.telecom-sudparis.eu/~berger_o/ - OpenPGP-Id: 2048R/5819D7E8 Ingenieur Recherche - Dept INF Institut Mines-Telecom, Telecom SudParis, Evry (France) -- To UNSUBSCRIBE, email to debian-python-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/87k3e2vfzh@inf-8660.int-evry.fr
Re: Joining the DPMT and git.debian.org access
Hi, >> My goal is to maintain sockjs-twisted (#735154). > > the problem is... we don't use git, not yet at least (nobody had time to > propose a transition) The Wiki page[1] suggests there are some git repositories, but I cannot find/see them. I also found out that some packages maintained by the team are hosted on alioth in collab-maint (src: bugz, dajaxice). Regarding the transition, the Java packaging team has both git and svn repositories. Maybe the DPMT can do the same starting with my package in the path suggested by the Wiki. Advice? Alex [1] https://wiki.debian.org/Teams/PythonModulesTeam/ -- To UNSUBSCRIBE, email to debian-python-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/cam79t8e1h0kh-ho3x83jvmpdtod0jjcpicrpdrucsg9hg+q...@mail.gmail.com
Re: Joining the DPMT and git.debian.org access
[Alexandre Rossi, 2014-01-13] > I'd like to join the Debian python modules team. > > My goal is to maintain sockjs-twisted (#735154). > > My alioth username is niol-guest. the problem is... we don't use git, not yet at least (nobody had time to propose a transition) -- Piotr Ożarowski Debian GNU/Linux Developer www.ozarowski.pl www.griffith.cc www.debian.org GPG Fingerprint: 1D2F A898 58DA AF62 1786 2DF7 AEF6 F1A2 A745 7645 -- To UNSUBSCRIBE, email to debian-python-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20140114081902.gm4...@sts0.p1otr.com
Re: Bug#735154: ITP: sockjs-twisted -- Simple library for adding SockJS support to a twisted application
Hi, On Mon, Jan 13, 2014 at 11:10 AM, Alexandre Rossi wrote: > Package: wnpp > Severity: wishlist > Owner: Alexandre Rossi > > * Package name: sockjs-twisted > Version : 1.2.1 > Upstream Author : Christopher Gamble > * URL : http://github.com/Fugiman/sockjs-twisted > * License : BSD > Programming Lang: Python > Description : Simple library for adding SockJS support to a twisted > application > > SockJS-Twisted passes all SockJS-Protocol v0.3.3 tests, and all > SockJS-Client qunit tests. In addition to basic SockJS usage, it supports : > - hosting multiple SockJS services off of one port, > - offering of static resources, dynamic pages, and SockJS endpoints off of a > single port, > - multiplexing. FYI, preliminary package for review available[1]. I'll also be seeking sponsorship when git hosting is finalized (need to be part of DPMT or hosting in collab-maint on alioth?). Regards, Alex [1] http://sousmonlit.zincube.net/~niol/apt/pool/main/s/socksjs-twisted/socksjs-twisted_1.2.1-1~bpo70+1.dsc -- To UNSUBSCRIBE, email to debian-python-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/cam79t8fof7yavxcifuj34ms3qdnkf_qmvozgdejggf+ua5y...@mail.gmail.com
