Re: [Python-Dev] Mercurial conversion repositories

Le vendredi 04 mars 2011 à 14:03 -0800, Santoso Wijaya a écrit : > [...] publishing patches by referring to a remote repository, > rather than uploading the diff. > > > Is this a recommended workflow at this point, or should we > generate/attach patch files still? Both, for experi

Re: [Python-Dev] Mercurial conversion repositories

> > [...] publishing patches by referring to a remote repository, > rather than uploading the diff. > Is this a recommended workflow at this point, or should we generate/attach patch files still? Both, for experimentation? ~/santa On Fri, Mar 4, 2011 at 1:15 PM, "Martin v. Löwis" wrote: > > As

Re: [Python-Dev] Mercurial conversion repositories

> As a mercurial user, I thank you for this effort! One question, > where/how do I send suggestion to what to add into .hgignore file? In > particular, I found these dynamically generated files after a build in > Windows (3.2) that probably should be entered as .hgignore entries: All patches shoul

Re: [Python-Dev] Mercurial conversion repositories

Hi, As a mercurial user, I thank you for this effort! One question, where/how do I send suggestion to what to add into .hgignore file? In particular, I found these dynamically generated files after a build in Windows (3.2) that probably should be entered as .hgignore entries: ? PC/python_nt_d.h ?

Re: [Python-Dev] Mercurial conversion repositories

On Mon, 28 Feb 2011 16:07:48 -0500 Barry Warsaw wrote: > On Feb 28, 2011, at 04:15 PM, Antoine Pitrou wrote: > > >On Mon, 28 Feb 2011 10:08:26 -0500 > >Barry Warsaw wrote: > >> > >> >BTW, I had not heard of hgeditor before, and wrote a small hg extension to > >> >do what you want (with HG: pref

Re: [Python-Dev] Mercurial conversion repositories

On Feb 28, 2011, at 04:15 PM, Antoine Pitrou wrote: >On Mon, 28 Feb 2011 10:08:26 -0500 >Barry Warsaw wrote: >> >> >BTW, I had not heard of hgeditor before, and wrote a small hg extension to >> >do what you want (with HG: prefix :) before I saw that others had already >> >replied with hgeditor.

Re: [Python-Dev] Mercurial conversion repositories

On Mon, 28 Feb 2011 10:08:26 -0500 Barry Warsaw wrote: > > >BTW, I had not heard of hgeditor before, and wrote a small hg extension to > >do what you want (with HG: prefix :) before I saw that others had already > >replied with hgeditor. The extension had 10 lines of code. > > We should find a

Re: [Python-Dev] Mercurial conversion repositories

On Feb 27, 2011, at 05:38 PM, Georg Brandl wrote: >While I understand the usefulness of the diff feature, it is not useful to >everyone, e.g. those using almost exclusively ``commit -m message``. The editor window doesn't pop up when you provide the -m flag, so the diff output is not relevant. >

Re: [Python-Dev] Mercurial conversion repositories

Barry Warsaw writes: > You mean, TortoiseHg supports incremental commits on a single file? That's > kind of neat, but scary. ;) Darcs people have been doing this for, well, for as long as Darcs has existed. It's not scary at all. In fact, in Darcs you can select hunks across files, too. __

Re: [Python-Dev] Mercurial conversion repositories

On 26.02.2011 21:49, Barry Warsaw wrote: > On Feb 26, 2011, at 01:49 AM, Éric Araujo wrote: > >>You speak to my heart, sir. In your ~/.hgrc, under the section [ui], >>set “editor = path/to/mercurial/source/hgeditor” and enjoy your diffs. >>I use it and love it. > > Except it doesn't quite work t

Re: [Python-Dev] Mercurial conversion repositories

On Sun, 27 Feb 2011 08:09:21 +0100 "Martin v. Löwis" wrote: > >> changeset: 72694:e65daae6cf44 > >> user:Antoine Pitrou > >> date:Mon Feb 21 21:30:55 2011 + > >> summary: Try s/UINT_MAX/INT_MAX/ > > > > It's not on an unnamed branch, it's on the "default" branch (which

Re: [Python-Dev] Mercurial conversion repositories

>> changeset: 72694:e65daae6cf44 >> user:Antoine Pitrou >> date:Mon Feb 21 21:30:55 2011 + >> summary: Try s/UINT_MAX/INT_MAX/ > > It's not on an unnamed branch, it's on the "default" branch (which is > omitted for concision by "hg log" and other commands with a similar

Re: [Python-Dev] Mercurial conversion repositories

On 2011-02-27 01:50, Barry Warsaw wrote: > On Feb 26, 2011, at 11:45 PM, Adrian Buehlmann wrote: > >> You'd have to take this up with Mercurial's BDFL Matt. He is a strong >> advocate for teaching users to learn edit their .hg/hgrc files. > > Well, I guess it's doubtful I'd change his mind then.

Re: [Python-Dev] Mercurial conversion repositories

On Feb 26, 2011, at 11:45 PM, Adrian Buehlmann wrote: >You'd have to take this up with Mercurial's BDFL Matt. He is a strong >advocate for teaching users to learn edit their .hg/hgrc files. Well, I guess it's doubtful I'd change his mind then. :) >Regarding Bazaar: FWIW, I periodically retried t

Re: [Python-Dev] Mercurial conversion repositories

On Sat, Feb 26, 2011 at 1:37 PM, Brett Cannon wrote: > There is hg-git, but that is hg on top of git. > Actually, hg-git is bidirectional. The hg-git documentation is written from the perspective of an hg client talking to a git server, but for a DVCS "client" and "server" are a matter of pers

Re: [Python-Dev] Mercurial conversion repositories

On 2011-02-26 22:06, Barry Warsaw wrote: > On Feb 26, 2011, at 02:05 PM, R. David Murray wrote: > >> On Sat, 26 Feb 2011 13:08:47 -0500, Barry Warsaw wrote: >>> $ cd py27 # now I want to synchronize >>> $ hg pull -u ssh://h...@hg.python.org/cpython >>> >>> but I'm not going to remember that url e

Re: [Python-Dev] Mercurial conversion repositories

On Sat, Feb 26, 2011 at 3:09 PM, Brett Cannon wrote: > Hg's is the mq (Mercurial Queue) extension. I prefer the hg shelve plugin (http://mercurial.selenic.com/wiki/ShelveExtension) for this, more intuitive to me ___ Python-Dev mailing list Python-Dev@py

Re: [Python-Dev] Mercurial conversion repositories

On Sat, Feb 26, 2011 at 13:30, Barry Warsaw wrote: > On Feb 26, 2011, at 12:09 PM, Brett Cannon wrote: > > >For other people's benefit, LoD == line of development (I think). > > Yes. It's just a word that isn't intimately tied to the implementation > details of a specific dVCS. > > >> I clone th

Re: [Python-Dev] Mercurial conversion repositories

On Feb 26, 2011, at 10:20 PM, Antoine Pitrou wrote: >Often (but not always), when you're wanting to do something, there's an >extension for Mercurial which can be enabled ;) >http://mercurial.selenic.com/wiki/ShareExtension You sound like an iPhone commercial: "There's an app for that." :) -Bar

Re: [Python-Dev] Mercurial conversion repositories

On Feb 26, 2011, at 12:09 PM, Brett Cannon wrote: >For other people's benefit, LoD == line of development (I think). Yes. It's just a word that isn't intimately tied to the implementation details of a specific dVCS. >> I clone the remote repository using the command in the devguide, so I now >>

Re: [Python-Dev] Mercurial conversion repositories

On Sat, 26 Feb 2011 16:06:45 -0500 Barry Warsaw wrote: > > >I find bazaar's model confusing, and hg's intuitive, just like Éric. > >And consider that I learned bazaar before mercurial. To me, it makes > >perfect sense that in a DVCS the "unit" is a directory containing > >a repository and a wor

Re: [Python-Dev] Mercurial conversion repositories

On Feb 26, 2011, at 02:05 PM, R. David Murray wrote: >On Sat, 26 Feb 2011 13:08:47 -0500, Barry Warsaw wrote: >> $ cd py27 # now I want to synchronize >> $ hg pull -u ssh://h...@hg.python.org/cpython >> >> but I'm not going to remember that url every time. It wouldn't be so bad if >> Mercurial

Re: [Python-Dev] Mercurial conversion repositories

On 27 February 2011 01:40, Nick Coghlan wrote: > On Sat, Feb 26, 2011 at 4:34 PM, Georg Brandl wrote: > >> Would it be possible to name "trunk" as "2.x" instead? Otherwise I > >> could see people getting confused and asking why trunk was closed, > >> and/or not the same as "default". > > > > Pro

Re: [Python-Dev] Mercurial conversion repositories

On Feb 26, 2011, at 01:49 AM, Éric Araujo wrote: >You speak to my heart, sir. In your ~/.hgrc, under the section [ui], >set “editor = path/to/mercurial/source/hgeditor” and enjoy your diffs. >I use it and love it. Except it doesn't quite work the way I want it to (hg 1.6.3). It opens your edito

Re: [Python-Dev] Mercurial conversion repositories

On Sat, Feb 26, 2011 at 10:08, Barry Warsaw wrote: > On Feb 26, 2011, at 01:49 AM, Éric Araujo wrote: > > >Le 25/02/2011 20:43, Barry Warsaw a écrit : > >> On Feb 25, 2011, at 06:40 PM, Adrian Buehlmann wrote: > >> [snip] > >>> Note that each of these branch clones will initially have your local

Re: [Python-Dev] Mercurial conversion repositories

On Fri, Feb 25, 2011 at 13:46, Barry Warsaw wrote: > On Feb 25, 2011, at 09:04 PM, Philippe Fremy wrote: > > >What you are asking for is available in TortoiseHg which absolutely > >rocks (if you are not allergic to the idea of a graphical tool). > > Like shellfish, bee-strings, and Perl I'm afrai

Re: [Python-Dev] Mercurial conversion repositories

On Sat, 26 Feb 2011 13:08:47 -0500, Barry Warsaw wrote: > $ cd py27 # now I want to synchronize > $ hg pull -u ssh://h...@hg.python.org/cpython > > but I'm not going to remember that url every time. It wouldn't be so bad if > Mercurial remembered the pull URL for me, as (you guessed it :) Bazaar

Re: [Python-Dev] Mercurial conversion repositories

>From http://mercurial.selenic.com/wiki/Branch#Named_branches: [...] a good rule of thumb is to use branch names sparingly and for rather longer lived concepts like "release branches" (rel-1, rel-2, etc) and rather not for short lived work of single developers So I think named branches make sense

Re: [Python-Dev] Mercurial conversion repositories

A Mercurial 'merge' is simply a creation of another changeset, which has two parents: the current tip of the branch you're working on, and the changeset you are merging with. ~/santa On Sat, Feb 26, 2011 at 10:23 AM, Barry Warsaw wrote: > On Feb 26, 2

Re: [Python-Dev] Mercurial conversion repositories

On Sat, Feb 26, 2011 at 9:55 AM, Antoine Pitrou wrote: > There is no such thing as an "unnamed branch". What would "hg branches" > show? An empty space? > I understand now why I was confused. I had previously read the sentence "Both Git and Mercurial support unnamed local branches." at http://m

Re: [Python-Dev] Mercurial conversion repositories

> >> But is there a need to have any changesets in the "trunk" named branch? > >> Couldn't the historical changesets just be in an unnamed branch, being > >> ancestor of so many named branches? > > > > There is no such thing as an "unnamed branch". What would "hg branches" > > show? An empty spac

Re: [Python-Dev] Mercurial conversion repositories

On Feb 26, 2011, at 06:32 PM, Éric Araujo wrote: >>> Named branches are exclusive, they can't be a subset of each other ;) > >Actually, they can. Take the example of the Mercurial repo itself. They >fix bugs in the stable branch and add features in default. When they >merge stable into default a

Re: [Python-Dev] Mercurial conversion repositories

>> But is there a need to have any changesets in the "trunk" named branch? >> Couldn't the historical changesets just be in an unnamed branch, being >> ancestor of so many named branches? > > There is no such thing as an "unnamed branch". What would "hg branches" > show? An empty space? hg branch

Re: [Python-Dev] Mercurial conversion repositories

On Feb 26, 2011, at 01:49 AM, Éric Araujo wrote: >Le 25/02/2011 20:43, Barry Warsaw a écrit : >> On Feb 25, 2011, at 06:40 PM, Adrian Buehlmann wrote: >> [snip] >>> Note that each of these branch clones will initially have your local >>> master repo as the default path [3,4]. If you'd like to have

Re: [Python-Dev] Mercurial conversion repositories

Le samedi 26 février 2011 à 18:36 +0100, "Martin v. Löwis" a écrit : > Am 26.02.2011 17:44, schrieb Antoine Pitrou: > > Le samedi 26 février 2011 à 08:38 -0800, Daniel Stutzbach a écrit : > >> On Fri, Feb 25, 2011 at 6:32 PM, Nick Coghlan > >> wrote: > >> Would it be possible to name "trun

Re: [Python-Dev] Mercurial conversion repositories

Am 26.02.2011 17:44, schrieb Antoine Pitrou: > Le samedi 26 février 2011 à 08:38 -0800, Daniel Stutzbach a écrit : >> On Fri, Feb 25, 2011 at 6:32 PM, Nick Coghlan >> wrote: >> Would it be possible to name "trunk" as "2.x" instead? >> Otherwise I >> could see people getting

Re: [Python-Dev] Mercurial conversion repositories

Le samedi 26 février 2011 à 09:27 -0800, Daniel Stutzbach a écrit : > On Sat, Feb 26, 2011 at 8:44 AM, Antoine Pitrou > wrote: > Le samedi 26 février 2011 à 08:38 -0800, Daniel Stutzbach a > écrit : > > > Can we just get rid of "trunk" altogether? It's history is

Re: [Python-Dev] Mercurial conversion repositories

>> Named branches are exclusive, they can't be a subset of each other ;) Actually, they can. Take the example of the Mercurial repo itself. They fix bugs in the stable branch and add features in default. When they merge stable into default and commit, default becomes a superset of stable. That

Re: [Python-Dev] Mercurial conversion repositories

On Sat, Feb 26, 2011 at 8:44 AM, Antoine Pitrou wrote: > Le samedi 26 février 2011 à 08:38 -0800, Daniel Stutzbach a écrit : > > Can we just get rid of "trunk" altogether? It's history is a strict > > subset of the 2.7 branch's history, isn't it? > > Named branches are exclusive, they can't be a

Re: [Python-Dev] Mercurial conversion repositories

>> Can we just use default for trunk and py3k? For the time when both >> trunk and py3k were active, it would create two unnamed branches on the >> default branch, but one merge would solve that. > > IMO, a dummy merge at the tip of the default branch may confuse users > looking at the history, e

Re: [Python-Dev] Mercurial conversion repositories

On Sun, Feb 27, 2011 at 3:00 AM, Antoine Pitrou wrote: > Besides, it would precisely make it harder to distinguish between > trunk and py3k development at the time both took place in parallel. With the legacy branches now being closed so they don't appear in the default output from hg commands, I

Re: [Python-Dev] Mercurial conversion repositories

On Sat, 26 Feb 2011 17:49:32 +0100 Éric Araujo wrote: > Le 26/02/2011 17:44, Antoine Pitrou a écrit : > >> Can we just get rid of "trunk" altogether? It's history is a strict > >> subset of the 2.7 branch's history, isn't it? > > > > Named branches are exclusive, they can't be a subset of each o

Re: [Python-Dev] Mercurial conversion repositories

Le 26/02/2011 17:44, Antoine Pitrou a écrit : >> Can we just get rid of "trunk" altogether? It's history is a strict >> subset of the 2.7 branch's history, isn't it? > > Named branches are exclusive, they can't be a subset of each other ;) Can we just use default for trunk and py3k? For the tim

Re: [Python-Dev] Mercurial conversion repositories

Le samedi 26 février 2011 à 08:38 -0800, Daniel Stutzbach a écrit : > On Fri, Feb 25, 2011 at 6:32 PM, Nick Coghlan > wrote: > Would it be possible to name "trunk" as "2.x" instead? > Otherwise I > could see people getting confused and asking why trunk was > closed,

Re: [Python-Dev] Mercurial conversion repositories

On Fri, Feb 25, 2011 at 6:32 PM, Nick Coghlan wrote: > Would it be possible to name "trunk" as "2.x" instead? Otherwise I > could see people getting confused and asking why trunk was closed, > and/or not the same as "default". > Can we just get rid of "trunk" altogether? It's history is a stric

Re: [Python-Dev] Mercurial conversion repositories

> Although I now admit "legacy-trunk" sounds quite accurate, and conveys > a clear warning to anyone wondering if they should use it. To stay in tree terminology, I propose "stump" (*). Or "rotten-trunk". Bikeshedding is such a fun activity :-) Regards, Martin (*) m-w.com: "the part of a plant

Re: [Python-Dev] Mercurial conversion repositories

Am 26.02.2011 15:42, schrieb Nick Coghlan: > On Sat, Feb 26, 2011 at 7:29 PM, "Martin v. Löwis" wrote: >>> I think people should simply get used to the idea that "default" is >>> /the/ main branch in Mercurial (*). It's even easier to remember IMHO >>> ("trunk" sounds a bit obscure at first, for a

Re: [Python-Dev] Mercurial conversion repositories

On Sat, 26 Feb 2011 15:44:08 +0100 Antoine Pitrou wrote: > Le dimanche 27 février 2011 à 00:42 +1000, Nick Coghlan a écrit : > > On Sat, Feb 26, 2011 at 7:29 PM, "Martin v. Löwis" > > wrote: > > >> I think people should simply get used to the idea that "default" is > > >> /the/ main branch in Me

Re: [Python-Dev] Mercurial conversion repositories

On 26/02/2011 14:44, Antoine Pitrou wrote: Le dimanche 27 février 2011 à 00:42 +1000, Nick Coghlan a écrit : On Sat, Feb 26, 2011 at 7:29 PM, "Martin v. Löwis" wrote: I think people should simply get used to the idea that "default" is /the/ main branch in Mercurial (*). It's even easier to rem

Re: [Python-Dev] Mercurial conversion repositories

Le dimanche 27 février 2011 à 00:42 +1000, Nick Coghlan a écrit : > On Sat, Feb 26, 2011 at 7:29 PM, "Martin v. Löwis" wrote: > >> I think people should simply get used to the idea that "default" is > >> /the/ main branch in Mercurial (*). It's even easier to remember IMHO > >> ("trunk" sounds a b

Re: [Python-Dev] Mercurial conversion repositories

On Sat, Feb 26, 2011 at 7:29 PM, "Martin v. Löwis" wrote: >> I think people should simply get used to the idea that "default" is >> /the/ main branch in Mercurial (*). It's even easier to remember IMHO >> ("trunk" sounds a bit obscure at first, for a non-native English >> speaker). > > +1. People

Re: [Python-Dev] Mercurial conversion repositories

On Sat, Feb 26, 2011 at 4:34 PM, Georg Brandl wrote: >> Would it be possible to name "trunk" as "2.x" instead? Otherwise I >> could see people getting confused and asking why trunk was closed, >> and/or not the same as "default". > > Problem is, you then have 1.5.2 released from the 2.x branch :)

Re: [Python-Dev] Mercurial conversion repositories

Antoine Pitrou wrote: On Sat, 26 Feb 2011 12:32:04 +1000 Nick Coghlan wrote: On Fri, Feb 25, 2011 at 10:19 AM, Antoine Pitrou wrote: $ hg branches default68026:f12ef116dd10 3.268025:cef92ee1a323 2.768010:8174d00d0

Re: [Python-Dev] Mercurial conversion repositories

> I think people should simply get used to the idea that "default" is > /the/ main branch in Mercurial (*). It's even easier to remember IMHO > ("trunk" sounds a bit obscure at first, for a non-native English > speaker). +1. People will recognize "trunk" as a svn think. If that doesn't clue them i

Re: [Python-Dev] Mercurial conversion repositories

On 26.02.2011 03:32, Nick Coghlan wrote: > On Fri, Feb 25, 2011 at 10:19 AM, Antoine Pitrou wrote: >>$ hg branches >>default68026:f12ef116dd10 >>3.268025:cef92ee1a323 >>2.768010:8174d00d0797 >>3.1

Re: [Python-Dev] Mercurial conversion repositories

On Sat, 26 Feb 2011 12:32:04 +1000 Nick Coghlan wrote: > On Fri, Feb 25, 2011 at 10:19 AM, Antoine Pitrou wrote: > >    $ hg branches > >    default                    68026:f12ef116dd10 > >    3.2                        68025:cef92ee1a323 > >    2.7                        68010:8174d00d0797 > >

Re: [Python-Dev] Mercurial conversion repositories

On Fri, Feb 25, 2011 at 10:19 AM, Antoine Pitrou wrote: >    $ hg branches >    default                    68026:f12ef116dd10 >    3.2                        68025:cef92ee1a323 >    2.7                        68010:8174d00d0797 >    3.1                        67955:5be8b695ea86 >    2.6          

Re: [Python-Dev] Mercurial conversion repositories

Hi, Le 25/02/2011 20:43, Barry Warsaw a écrit : > On Feb 25, 2011, at 06:40 PM, Adrian Buehlmann wrote: > [snip] >> Note that each of these branch clones will initially have your local >> master repo as the default path [3,4]. If you'd like to have the default >> push/pull path to point to ssh://h

Re: [Python-Dev] Mercurial conversion repositories

On 25Feb2011 14:43, Barry Warsaw wrote: | [...] And I have to | remember to fiddle with .hg/hgrc when I clone a new branch working directory, | but I guess that's mostly a one-time cost. Hmm. Why do you need to fiddle with the hgrc? Just curious. | I'll have to remember that 'hg pull' does not

Re: [Python-Dev] Mercurial conversion repositories

On Feb 25, 2011, at 09:04 PM, Philippe Fremy wrote: >What you are asking for is available in TortoiseHg which absolutely >rocks (if you are not allergic to the idea of a graphical tool). Like shellfish, bee-strings, and Perl I'm afraid. :) >You can even select indvidually inside a file which lin

Re: [Python-Dev] Mercurial conversion repositories

Le samedi 26 février 2011 à 08:40 +1100, Neil Hodgson a écrit : > Antoine Pitrou: > > > It should now be fixed in current SVN, meaning the final conversion > > should be perfectly usable with the eol extension enabled. > >Good. > > > Do you find other issues under Windows? Have you tried pus

Re: [Python-Dev] Mercurial conversion repositories

Antoine Pitrou: > It should now be fixed in current SVN, meaning the final conversion > should be perfectly usable with the eol extension enabled. Good. > Do you find other issues under Windows? Have you tried pushing changes? Since I'm not a member of core developers I used a http pull a

Re: [Python-Dev] Mercurial conversion repositories

On 25/02/2011 20:43, Barry Warsaw wrote: > > One immediate thing that I'm missing from Bazaar is that 'bzr commit' invokes > my editor and always shows me a 'diff -u' in the commit message buffer. This > is incredibly handy because I don't have to remember to do the diff in a > different window, a

Re: [Python-Dev] Mercurial conversion repositories

On Fri, 25 Feb 2011 14:43:15 -0500 Barry Warsaw wrote: > > I'll have to remember that 'hg pull' does not update the working copy by > default, and eventually I'll figure out the whole merge thing. You can use "hg pull -u" to update (and "hg pull -uv" if you want to see the list of updated files)

Re: [Python-Dev] Mercurial conversion repositories

On Feb 25, 2011, at 06:40 PM, Adrian Buehlmann wrote: >First, get an initial clone (let's name it 'master') over the wire >using: [1] > > $ hg clone -U ssh://h...@hg.python.org/cpython master > >Then create a hardlinked clone [2] for working in each branch, >specifying the branch to check out usi

Re: [Python-Dev] Mercurial conversion repositories

On 2011-02-25 17:12, Barry Warsaw wrote: > On Feb 25, 2011, at 01:50 AM, Raymond Hettinger wrote: > >> >> On Feb 25, 2011, at 12:09 AM, Martin v. Löwis wrote: >> >>> I think I would have liked the strategy of the PEP better (i.e. >>> create clones for feature branches, rather than putting all >>>

Re: [Python-Dev] Mercurial conversion repositories

On Fri, 25 Feb 2011 13:52:58 +0100 Antoine Pitrou wrote: > On Fri, 25 Feb 2011 19:13:49 +1100 > Neil Hodgson wrote: > >With hg 1.7.5 on Windows 7 I performed a non-core checkout: > > > > hg clone http://hg.python.org/cpython > > > >The eol extension is enabled in global settings. > > Y

Re: [Python-Dev] Mercurial conversion repositories

On 25.02.2011 17:31, Georg Brandl wrote: > On 25.02.2011 17:12, Barry Warsaw wrote: >> On Feb 25, 2011, at 01:50 AM, Raymond Hettinger wrote: >> >>> >>>On Feb 25, 2011, at 12:09 AM, Martin v. Löwis wrote: >>> I think I would have liked the strategy of the PEP better (i.e. create clones f

Re: [Python-Dev] Mercurial conversion repositories

On 25.02.2011 17:12, Barry Warsaw wrote: > On Feb 25, 2011, at 01:50 AM, Raymond Hettinger wrote: > >> >>On Feb 25, 2011, at 12:09 AM, Martin v. Löwis wrote: >> >>> I think I would have liked the strategy of the PEP better (i.e. >>> create clones for feature branches, rather than putting all >>> i

Re: [Python-Dev] Mercurial conversion repositories

Hi Barry, > The way I work with the Subversion branches is to have all the active branches > checked out into separate directories under a common parent, e.g. > > ~/projects/python/py26 > ~/projects/python/py27 > ~/projects/python/trunk > ~/projects/python/py31 > ~/projects/python/py32 > ~/proje

Re: [Python-Dev] Mercurial conversion repositories

On Feb 25, 2011, at 01:50 AM, Raymond Hettinger wrote: > >On Feb 25, 2011, at 12:09 AM, Martin v. Löwis wrote: > >> I think I would have liked the strategy of the PEP better (i.e. >> create clones for feature branches, rather than putting all >> in a single repository). > >In my brief tests, the s

Re: [Python-Dev] Mercurial conversion repositories

On 25.02.2011 09:25, "Martin v. Löwis" wrote: > Am 25.02.2011 09:17, schrieb Dirkjan Ochtman: >> On Fri, Feb 25, 2011 at 09:09, "Martin v. Löwis" wrote: >>> I think I would have liked the strategy of the PEP better (i.e. >>> create clones for feature branches, rather than putting all >>> in a sing

Re: [Python-Dev] Mercurial conversion repositories

On Thu, 24 Feb 2011 17:39:40 -0800 Brett Cannon wrote: > > > > Your clone will contain the following branches: > > > >$ hg branches > >default68026:f12ef116dd10 > >3.268025:cef92ee1a323 > >2.768010:8174d00d0797 > >

Re: [Python-Dev] Mercurial conversion repositories

On Fri, 25 Feb 2011 19:13:49 +1100 Neil Hodgson wrote: >With hg 1.7.5 on Windows 7 I performed a non-core checkout: > > hg clone http://hg.python.org/cpython > >The eol extension is enabled in global settings. Yes, please try to disable it. The issue is we have a .hgeol in the repositor

Re: [Python-Dev] Mercurial conversion repositories

On Feb 25, 2011, at 12:09 AM, Martin v. Löwis wrote: > I think I would have liked the strategy of the PEP better (i.e. > create clones for feature branches, rather than putting all > in a single repository). In my brief tests, the single repository has been easy to work with. If they were separa

Re: [Python-Dev] Mercurial conversion repositories

Am 25.02.2011 09:29, schrieb Dirkjan Ochtman: > On Fri, Feb 25, 2011 at 09:25, "Martin v. Löwis" wrote: >> If there are hundreds of them, it's far from trivial. I don't even know >> how to find out which one to convert. > > Right, I mostly mean it's trivial for Antoine or Georg to extract into >

Re: [Python-Dev] Mercurial conversion repositories

On Fri, Feb 25, 2011 at 09:25, "Martin v. Löwis" wrote: > If there are hundreds of them, it's far from trivial. I don't even know > how to find out which one to convert. Right, I mostly mean it's trivial for Antoine or Georg to extract into a clone (at least that's how I was planning to do it, no

Re: [Python-Dev] Mercurial conversion repositories

Am 25.02.2011 09:17, schrieb Dirkjan Ochtman: > On Fri, Feb 25, 2011 at 09:09, "Martin v. Löwis" wrote: >> I think I would have liked the strategy of the PEP better (i.e. >> create clones for feature branches, rather than putting all >> in a single repository). > > Unnamed heads are trivial to co

Re: [Python-Dev] Mercurial conversion repositories

On Fri, Feb 25, 2011 at 09:09, "Martin v. Löwis" wrote: > I think I would have liked the strategy of the PEP better (i.e. > create clones for feature branches, rather than putting all > in a single repository). Unnamed heads are trivial to convert to clones. Cheers, Dirkjan

Re: [Python-Dev] Mercurial conversion repositories

With hg 1.7.5 on Windows 7 I performed a non-core checkout: hg clone http://hg.python.org/cpython The eol extension is enabled in global settings. I looked at things a bit, opening some files and using the Tortoise Hg Repository Explorer. But made no actual changes. Running hg diff produces

Re: [Python-Dev] Mercurial conversion repositories

> Georg and I have been working on converting the SVN repository to > Mercurial. We can now present you a test repository (actually, two). Thanks for working on this! How do you want bugs reported? Can you please update the PEP? I see at least the following deviations: - the extrahist repository

Re: [Python-Dev] Mercurial conversion repositories

On Fri, Feb 25, 2011 at 01:19, Antoine Pitrou wrote: > Georg and I have been working on converting the SVN repository to > Mercurial. We can now present you a test repository (actually, two). Sorry everyone for taking so long on the conversion. Looks like Antoine and Georg have more time and ener

Re: [Python-Dev] Mercurial conversion repositories

On 25.02.2011 01:19, Antoine Pitrou wrote: > > Hello, > > Georg and I have been working on converting the SVN repository to > Mercurial. We can now present you a test repository (actually, two). The implied agenda is that we would be *very* happy if we could do the final conversion during PyCon

Re: [Python-Dev] Mercurial conversion repositories

On Fri, Feb 25, 2011 at 02:19, Antoine Pitrou wrote: > > Hello, > > Georg and I have been working on converting the SVN repository to > Mercurial. We can now present you a test repository (actually, two). > > > CPython repository: http://hg.python.org/cpython/ > -- > > This is the

Re: [Python-Dev] Mercurial conversion repositories

On Thu, Feb 24, 2011 at 16:19, Antoine Pitrou wrote: > > Hello, > > Georg and I have been working on converting the SVN repository to > Mercurial. We can now present you a test repository (actually, two). > Thanks to the both of you for moving this forward! > > > CPython repository: http://hg.

Re: [Python-Dev] Mercurial conversion repositories

On Feb 24, 2011, at 4:19 PM, Antoine Pitrou wrote: > Georg and I have been working on converting the SVN repository to > Mercurial. We can now present you a test repository (actually, two). > > > CPython repository: http://hg.python.org/cpython/ Thank you both for all the effort you put in. I'

[Python-Dev] Mercurial conversion repositories

Hello, Georg and I have been working on converting the SVN repository to Mercurial. We can now present you a test repository (actually, two). CPython repository: http://hg.python.org/cpython/ -- This is the main conversion repository. It contains all history of trunk and py3k (