From: Philip J. <pj...@un...> - 2011-04-19 02:07:19
|
I now have a test main repo up @ http://hg.python.org/jython If you're a committer, do: $ hg clone ssh://hg [at] hg.python.org/jython (Any committers lacking read/write access to hg.python.org should send me their ssh public key so it can be added) otherwise: $ hg clone http://hg.python.org/jython This is just a test repository, so committers are encouraged to push test commits here. All of those changes will go away when we make the final switchover. Additionally, the fullhistory repository is @ http://hg.python.org/jython-fullhistory We'll also be switching the jython-checkins mailing list to python.org when we move to mercurial (we've been planning to move all of our mailing lists there eventually), so you'll want to subscribe to the new list here: http://mail.python.org/mailman/listinfo/jython-checkins You should read the CPython devguide, we'll for the most part follow their mercurial workflow: http://docs.python.org/devguide/ Probably the main thing you need to know about the new hg workflow compared to subversion/svnmerge's is that when you're making a change you should first consider what branch the change needs to go on. Then: o Commit the change to the earliest (stable) applicable branch. e.g. does this change need to go to 2.5? if it's a bug fix, likely, if a new feature, a lot less likely but maybe o Then if you committed the change to the 2.5 branch or earlier, you should merge the change upwards, eventually to the default (development) branch This way the development branch is always a strict superset of the stable branches (i.e. default is a superset of 2.5, 2.5 of 2.2). This is the opposite of how we generally did things with svn/svnmerge, of doing all work first on trunk then merging to stable branches. Additionally if you're pushing a change to a stable branch, you should be pushing a merge to default at the same time. That way the default (development) branch is always the tip (aka HEAD). Then others don't have to decide on merging your changes to default. This is akin to the subversion/svnmerge routine of always immediately merging or blocking your changes to a stable branch after a change was applied to trunk. In the rare case that you're applying a change to 2.5 that shouldn't go to default, you should merge an empty commit (a dummy merge) -- this is akin to an svmerge block. Welcome to DAG-based distributed development! Don't be afraid to ask questions, there's a learning curve here, but ultimately hg will make Jython development easier. -- Philip Jenvey |
From: Alan K. <jyt...@xh...> - 2011-07-24 14:18:23
|
[Philip] > I now have a test main repo up @ > > http://hg.python.org/jython So, what's the current position with the mercurial switchover? I have a couple of small bug fixes I want to make against 2.5.2. Should I go ahead and make them under SVN? Alan. |
From: Philip J. <pj...@un...> - 2011-07-24 19:45:43
|
On Jul 24, 2011, at 7:18 AM, Alan Kennedy wrote: > [Philip] >> I now have a test main repo up @ >> >> http://hg.python.org/jython > > So, what's the current position with the mercurial switchover? > > I have a couple of small bug fixes I want to make against 2.5.2. > > Should I go ahead and make them under SVN? The core is hosted on hg now, I think you missed the "Official Jython repo now migrated to Mercurial" email: http://old.nabble.com/Official-Jython-repo-now-migrated-to-Mercurial-td31567681.html There's some more info here: http://wiki.python.org/jython/SvnToHgMigration You'll need to send me your public ssh key if you haven't already so we can get you write access. -- Philip Jenvey |
From: <fwi...@gm...> - 2011-07-26 14:54:49
|
On Sun, Jul 24, 2011 at 12:45 PM, Philip Jenvey <pj...@un...> wrote: > The core is hosted on hg now, I think you missed the "Official Jython repo now migrated to Mercurial" email: Once everything is hosted on Mercurial, I'll make the svn repo read only. It sounds like it isn't time for that yet since only the core is moved over, right? -Frank |
From: Oti <oh...@gm...> - 2011-07-26 17:45:00
|
Frank, yes, the installer is still missing e.g. Oti. On Tue, Jul 26, 2011 at 4:54 PM, fwi...@gm... <fwi...@gm...> wrote: > On Sun, Jul 24, 2011 at 12:45 PM, Philip Jenvey <pj...@un...> wrote: >> The core is hosted on hg now, I think you missed the "Official Jython repo now migrated to Mercurial" email: > Once everything is hosted on Mercurial, I'll make the svn repo read > only. It sounds like it isn't time for that yet since only the core is > moved over, right? > > -Frank > > ------------------------------------------------------------------------------ > Magic Quadrant for Content-Aware Data Loss Prevention > Research study explores the data loss prevention market. Includes in-depth > analysis on the changes within the DLP market, and the criteria used to > evaluate the strengths and weaknesses of these DLP solutions. > http://www.accelacomm.com/jaw/sfnl/114/51385063/ > _______________________________________________ > Jython-dev mailing list > Jyt...@li... > https://lists.sourceforge.net/lists/listinfo/jython-dev > |
From: Philip J. <pj...@un...> - 2011-07-26 19:00:14
|
Right. I made some good progress on the installer a while back but it still has a little bit more to do, hopefully I can get back to it sooner rather than later. I hope the website repo won't be as involved.. On Jul 26, 2011, at 10:44 AM, Oti wrote: > Frank, > > yes, the installer is still missing e.g. > Oti. > > On Tue, Jul 26, 2011 at 4:54 PM, fwi...@gm... > <fwi...@gm...> wrote: >> On Sun, Jul 24, 2011 at 12:45 PM, Philip Jenvey <pj...@un...> wrote: >>> The core is hosted on hg now, I think you missed the "Official Jython repo now migrated to Mercurial" email: >> Once everything is hosted on Mercurial, I'll make the svn repo read >> only. It sounds like it isn't time for that yet since only the core is >> moved over, right? -- Philip Jenvey |