Re: [PHP-DEV] better changeset tracking

2007-06-01 Thread Sean Coates
I apologize in advance for jumping into this thread so late (finally trying to catch up on internals@). FWIW, I'd also like to move to SVN, eventually (and inevitably (-: ). I've opposed this move for php.net in the past, but only because the proposals I was fighting were for a partial conv

Re: [PHP-DEV] better changeset tracking

2007-05-31 Thread Christian Schneider
Stefan Walk wrote: At the moment, SVN is a pain in the ass when it comes to merging, but they claim that it's fixed in 1.5... svnmerge.py: http://www.orcaware.com/svn/wiki/Svnmerge.py can help quite a lot as it maintains merges. And as it stores the merge information in SVN properties I'm sur

Re: [PHP-DEV] better changeset tracking

2007-05-31 Thread Pierre
On 5/31/07, Stefan Walk <[EMAIL PROTECTED]> wrote: IMO, git is a choice worth thinking about for linux-only projects, but if there are windows clients involved, it's not anymore (last time i checked, it required cygwin). I used it under cygwin and works well as far as I can tell (be sure to use

Re: [PHP-DEV] better changeset tracking

2007-05-31 Thread Stefan Walk
IMO, git is a choice worth thinking about for linux-only projects, but if there are windows clients involved, it's not anymore (last time i checked, it required cygwin). At the moment, SVN is a pain in the ass when it comes to merging, but they claim that it's fixed in 1.5... Regards, Stefan --

Re: [PHP-DEV] better changeset tracking

2007-05-31 Thread Pierre
On 5/31/07, Rasmus Lerdorf <[EMAIL PROTECTED]> wrote: > freedesktop has moved to GIT some time ago and for what I heard from > the developers, it is a huge improvement in their development process. > The only bad point (which exists with any other migratrion) is the > time required to learn the

Re: [PHP-DEV] better changeset tracking

2007-05-31 Thread Rasmus Lerdorf
Pierre wrote: > Hi, > > On 5/31/07, Andi Gutmans <[EMAIL PROTECTED]> wrote: > >> As we expect many more years for PHP we should make sure that the train >> we're riding has momentum and can help us continue to scale our dev >> process. I think SVN is the right train to hop onto. > > I would like

Re: [PHP-DEV] better changeset tracking

2007-05-31 Thread Pierre
Hi, On 5/31/07, Andi Gutmans <[EMAIL PROTECTED]> wrote: As we expect many more years for PHP we should make sure that the train we're riding has momentum and can help us continue to scale our dev process. I think SVN is the right train to hop onto. I would like to propose Git. I think it is m

Re: [PHP-DEV] better changeset tracking

2007-05-30 Thread Lukas Kahwe Smith
Hi, So I guess what we need is to figure out a bit what our current development process is, what if it we actually want to keep and what we are hoping to get in the future. Maybe we can brainstorm at php|vikinger on this. One of the "processes" we have is that we have no formal processes and

RE: [PHP-DEV] better changeset tracking

2007-05-30 Thread Andi Gutmans
the right train to hop onto. Andi > -Original Message- > From: Rasmus Lerdorf [mailto:[EMAIL PROTECTED] > Sent: Wednesday, May 30, 2007 7:57 AM > To: [EMAIL PROTECTED] > Cc: PHP Internals List > Subject: Re: [PHP-DEV] better changeset tracking > > Jani Taskinen wrot

Re: [PHP-DEV] better changeset tracking

2007-05-30 Thread Rasmus Lerdorf
Jani Taskinen wrote: > On Wed, 2007-05-30 at 01:29 -0700, Rasmus Lerdorf wrote: >> Well, the problem is that if the work involved to do this is in any way >> CVS-specific, it will be throw-away work once we move away from CVS, >> which is inevitable. What we don't know at this point is the lifespa

Re: [PHP-DEV] better changeset tracking

2007-05-30 Thread Jani Taskinen
On Wed, 2007-05-30 at 01:29 -0700, Rasmus Lerdorf wrote: > Well, the problem is that if the work involved to do this is in any way > CVS-specific, it will be throw-away work once we move away from CVS, > which is inevitable. What we don't know at this point is the lifespan > of CVS. I'm unmotivat

Re: [PHP-DEV] better changeset tracking

2007-05-30 Thread Jani Taskinen
Good luck forcing people developing PHP to do this or even agreeing doing it. Laziness, do-what-I-need and chaos has been the driving force of PHP development all the time. That works, why change it? ;) But this is nice idea to add, having bug reports linked to cvs commits.. --Jani On Tue, 2007

Re: [PHP-DEV] better changeset tracking

2007-05-30 Thread Christian Schneider
Wez Furlong wrote: > As Rasmus said, it's a job for someone to sit down with a copy of the > repository, cvs2svn, a lot of time, and a lot of patience, to make the > migration work... but we're not stopping anyone from volunteering :) I converted our company's CVS to SVN a while ago and might be w

Re: [PHP-DEV] better changeset tracking

2007-05-30 Thread Wez Furlong
On 5/30/07, Steph Fox <[EMAIL PROTECTED]> wrote: Given that this entire thread came about because at least two of the core team don't have time to deal with merging to HEAD, that doesn't seem very likely. But you're right to put an end to quick-fix and possibly cvs-specific solutions. Does svn ev

Re: [PHP-DEV] better changeset tracking

2007-05-30 Thread Steph Fox
Rasmus, We've kinda moved away from the problem in hand. Moving the entire repository over to svn doesn't make it any easier to know when someone commits something that should be merged and doesn't merge it. It also doesn't do anything to resolve the relationship between PHP branch releases and

Re: [PHP-DEV] better changeset tracking

2007-05-30 Thread Rasmus Lerdorf
Steph Fox wrote: > Rasmus, hi, > > We've kinda moved away from the problem in hand. Moving the entire > repository over to svn doesn't make it any easier to know when someone > commits something that should be merged and doesn't merge it. It also > doesn't do anything to resolve the relationship b

Re: [PHP-DEV] better changeset tracking

2007-05-30 Thread Steph Fox
- Steph - Original Message - From: "Andi Gutmans" <[EMAIL PROTECTED]> To: "Rasmus Lerdorf" <[EMAIL PROTECTED]> Cc: "Wez Furlong" <[EMAIL PROTECTED]>; "Ilia Alshanetsky" <[EMAIL PROTECTED]>; "Edin Kadribasic" <

Re: [PHP-DEV] better changeset tracking

2007-05-30 Thread Rasmus Lerdorf
oretical sense) before the move than >>> after. >>> >>> So yeah - a huge job, and not only from the repository admin perspective. >>> >>> - Steph >>> >>> >>> - Original Message - From: "Andi Gutmans" <[EMAI

Re: [PHP-DEV] better changeset tracking

2007-05-30 Thread Steph
Wez said. A few more columns in the bugs database would help a lot. And last but not least bug numbers could contain something like P for PHP, L for PECL and R for PEAR. That way it is clear where they came from. Another way is to extend them with a first digit and then merge the tables. It is imh

Re: [PHP-DEV] better changeset tracking

2007-05-30 Thread Marcus Boerger
I didn't recommend it because of changset tracking, but rather if >> we make significant changes to our dev infrastructure we might as well >> build it on the right foundations and moving to SVN will be inevitable >> at some point. I think it already provides enough value tod

Re: [PHP-DEV] better changeset tracking

2007-05-29 Thread Steph Fox
Hi Stas, I used to think so, but my experience working with SVN on Framework shows it's not that different, at least on the level I use it (and that'd be the level most other people would use it I guess - checkout/update/diff/commit). So if we talking learning curve, it's not that different -

Re: [PHP-DEV] better changeset tracking

2007-05-29 Thread William A. Rowe, Jr.
Stanislav Malyshev wrote: >> Switching to subversion would mean a learning curve for some, and a >> change of PHP development tools and practice for _everyone_ involved >> in php.net. It's a major step, particularly at a time when people are > > I used to think so, but my experience working with

Re: [PHP-DEV] better changeset tracking

2007-05-29 Thread Stanislav Malyshev
Switching to subversion would mean a learning curve for some, and a change of PHP development tools and practice for _everyone_ involved in php.net. It's a major step, particularly at a time when people are I used to think so, but my experience working with SVN on Framework shows it's not tha

Re: [PHP-DEV] better changeset tracking

2007-05-29 Thread Rasmus Lerdorf
f" <[EMAIL PROTECTED]> > Cc: "Wez Furlong" <[EMAIL PROTECTED]>; "Ilia Alshanetsky" > <[EMAIL PROTECTED]>; "Edin Kadribasic" <[EMAIL PROTECTED]>; "PHP Internals > List" > Sent: Wednesday, May 30, 2007 6:18 AM > Subje

Re: [PHP-DEV] better changeset tracking

2007-05-29 Thread Steph Fox
Hey Lukas, Also keep in mind that there are plenty of subprojects under cvs.php.net. These tend to be a lot simpler on the branching/merging side. So maybe these are good testing grounds to get some of the infrastructure for karma management in place. And then once we start feeling comfortable

Re: [PHP-DEV] better changeset tracking

2007-05-29 Thread Steph Fox
din Kadribasic" <[EMAIL PROTECTED]>; "PHP Internals List" Sent: Wednesday, May 30, 2007 6:18 AM Subject: RE: [PHP-DEV] better changeset tracking Well I think Subversion the way it is today is already considerably better. Just the directory versioning and the better performa

Re: [PHP-DEV] better changeset tracking

2007-05-29 Thread Lukas Kahwe Smith
Andi Gutmans wrote: Well I think Subversion the way it is today is already considerably better. Just the directory versioning and the better performance would already pay off in the PHP project. No doubt that merge tracking is an added bonus but it's not exactly applicable (yet) to the way we wor

RE: [PHP-DEV] better changeset tracking

2007-05-29 Thread Andi Gutmans
ay 29, 2007 9:39 PM > To: Andi Gutmans > Cc: Wez Furlong; Ilia Alshanetsky; Edin Kadribasic; PHP Internals List > Subject: Re: [PHP-DEV] better changeset tracking > > I really don't think moving to subversion until they finish > the merge tracking code makes much sense. The on

Re: [PHP-DEV] better changeset tracking

2007-05-29 Thread Rasmus Lerdorf
epend on it. > > Andi > > >> -Original Message- >> From: Wez Furlong [mailto:[EMAIL PROTECTED] >> Sent: Monday, May 28, 2007 8:57 AM >> To: Ilia Alshanetsky >> Cc: Edin Kadribasic; PHP Internals List >> Subject: [PHP-DEV] better changeset track

RE: [PHP-DEV] better changeset tracking

2007-05-29 Thread Andi Gutmans
AM > To: Ilia Alshanetsky > Cc: Edin Kadribasic; PHP Internals List > Subject: [PHP-DEV] better changeset tracking > > As a fellow busy person, I completely understand this situation. > > I also recognize that we need to find a way to guarantee that > patches don't

Fw: [PHP-DEV] better changeset tracking

2007-05-29 Thread Steph Fox
Wez - an update, Still, this concept relies heavily on the idea that it's possible to append generated text to a CVS commit message, and if it isn't - it won't work. w00t :) http://ximbiot.com/cvs/manual/cvs-1.12.13/cvs_18.html#SEC191 - Steph -- PHP Internals - PHP Runtime Development Mai

Re: [PHP-DEV] better changeset tracking

2007-05-29 Thread Steph Fox
On 5/29/07, Steph Fox <[EMAIL PROTECTED]> wrote: This could work, except of course we don't have any such thing as 'a maintenance ticket' or a way to set priority to 'merge'. It's kind of the opposite way around to the way the PHP bug system works... and it probably would be a pain to have it a

Re: [PHP-DEV] better changeset tracking

2007-05-29 Thread Wez Furlong
On 5/29/07, Steph Fox <[EMAIL PROTECTED]> wrote: This could work, except of course we don't have any such thing as 'a maintenance ticket' or a way to set priority to 'merge'. It's kind of the opposite way around to the way the PHP bug system works... and it probably would be a pain to have it as

Fw: [PHP-DEV] better changeset tracking

2007-05-29 Thread Steph Fox
Wez, This could work, except of course we don't have any such thing as 'a maintenance ticket' or a way to set priority to 'merge'. It's kind of the opposite way around to the way the PHP bug system works... and it probably would be a pain to have it as part of an open system (in the sense that

Re: [PHP-DEV] better changeset tracking

2007-05-29 Thread Steph Fox
Hi Wez, As you said, it's pretty straightforward to handle bugs this way, but a pain to open a ticket for every little maintenance job. We solve that problem by opening up a maintenance ticket per milestone (eg: X.Y.Z release maintenance ticket) and use that as a catch all for those misc commit

Re: [PHP-DEV] better changeset tracking

2007-05-29 Thread Wez Furlong
We use trac as an engineering ticketing system; we open tickets to track things that need doing, be they bug fixes, enhancements or other maintenance work. We require that every commit to portions of the repos that contain code reference a ticket number in trac, and reject commits that don't. As

Re: [PHP-DEV] better changeset tracking

2007-05-28 Thread Steph Fox
Hi Wez, I think the key is in forcing every commit to reference a ticket; that way you can't "lose" a changeset by forgetting to put a bug number in there. Going back on-list... It's a good idea in principle, but I can foresee some problems with it. Many (most?) of the unnumbered fixes Ilia

Re: [PHP-DEV] better changeset tracking

2007-05-28 Thread sean finney
hi folks, On Monday 28 May 2007 17:56:54 Wez Furlong wrote: > I think we could do with investing a little bit of time into finding a > way to automatically review commits to see if they have been merged to > all relevant branches. For this to be viable, we should probably > adopt the practice of

Re: [PHP-DEV] better changeset tracking

2007-05-28 Thread Lukas Kahwe Smith
Wez Furlong wrote: Once we have that data, we could have job that periodically (daily) reviews the activity per bug report and sends an email reminder about reports that have missing merge activity for longer than a week. Wouldnt we then also have to have some flag on the bug to make it clear

Re: [PHP-DEV] better changeset tracking

2007-05-28 Thread Pierre
Sorry for my initial offlist reply. My evil gmail does not "reply-all" by default :P Here is an answer from Wez to my reply: On 5/28/07, Pierre <[EMAIL PROTECTED]> wrote: I'm all for this solution. I asked to do it a couple of years ago (and a couple of times since). All commits besides CS or d

[PHP-DEV] better changeset tracking

2007-05-28 Thread Wez Furlong
As a fellow busy person, I completely understand this situation. I also recognize that we need to find a way to guarantee that patches don't slip through the cracks and don't get lost. I think we could do with investing a little bit of time into finding a way to automatically review commits to s