Re: [Python-Dev] I am now lost - committed, pulled, merged, what is collapse?

2011-03-21 Thread Adrian Buehlmann
On 2011-03-21 14:40, R. David Murray wrote: On Mon, 21 Mar 2011 18:33:00 +0900, Stephen J. Turnbull step...@xemacs.org wrote: R. David Murray writes: On Mon, 21 Mar 2011 14:07:46 +0900, Stephen J. Turnbull step...@xemacs.org wrote: No, at best the DVCS workflow forces the developer on

Re: [Python-Dev] hg diff

2011-03-08 Thread Adrian Buehlmann
On 2011-03-08 09:38, Martin v. Löwis wrote: However, as Michael points out, you can have your tools generate the patch. For example, it shouldn't be too hard to add a dynamic patch generator to Roundup (although I haven't thought about the UI or the CPU burden). For Mercurial, that's more

Re: [Python-Dev] hg diff

2011-03-08 Thread Adrian Buehlmann
On 2011-03-08 10:53, Adrian Buehlmann wrote: On 2011-03-08 09:38, Martin v. Löwis wrote: However, as Michael points out, you can have your tools generate the patch. For example, it shouldn't be too hard to add a dynamic patch generator to Roundup (although I haven't thought about the UI

Re: [Python-Dev] hg pull failed

2011-03-06 Thread Adrian Buehlmann
On 2011-03-06 20:09, Martin v. Löwis wrote: So, when I cloned, I should have done something like this: hg clone http://hg.python.org/cpython hg clone cpython 3.2 hg clone 3.2 3.1 hg clone cpython 2.7 hg clone 2.7 2.6 hg clone 2.6 2.5 hg clone 2.5 2.4

Re: [Python-Dev] of branches and heads

2011-02-27 Thread Adrian Buehlmann
On 2011-02-26 23:26, Greg Ewing wrote: From: Antoine Pitrou - a branch usually means a named branch: a set of changesets bearing the same label (e.g. default); that label is freely chosen by the committer at any point, and enforces no topological characteristic There are *some*

Re: [Python-Dev] devguide (hg_transition): Advertise hg import over patch.

2011-02-27 Thread Adrian Buehlmann
On 2011-02-27 16:35, Scott Dial wrote: On 2/27/2011 10:18 AM, Antoine Pitrou wrote: Well, chances are TortoiseHG comes with an UI to apply patches (TortoiseSVN had one), so the command-line instructions may be of little use to them. I don't believe TortoiseHG has such a feature (or I can't

Re: [Python-Dev] devguide (hg_transition): Advertise hg import over patch.

2011-02-27 Thread Adrian Buehlmann
On 2011-02-27 23:21, Neil Hodgson wrote: Adrian Buehlmann: FWIW, we are very close to releasing TortoiseHg 2.0 (due March 1st), which ported the current Gtk based TortoiseHg to Qt (although, it was more like a rewrite :-). I hope this is going to be fast. Here, the Workbench window [1

Re: [Python-Dev] Mercurial conversion repositories

2011-02-26 Thread Adrian Buehlmann
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 ba...@python.org 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

Re: [Python-Dev] hg extensions was Mercurial conversion repositories

2011-02-26 Thread Adrian Buehlmann
On 2011-02-27 00:13, Dj Gilcrease wrote: Branch Management bookmarks http://mercurial.selenic.com/wiki/BookmarksExtension Bookmarks will be in Mercurial core for Mercurial 1.8, which will be released in a few days (March 1st). So, with 1.8 it's no longer needed to enable this

Re: [Python-Dev] Mercurial conversion repositories

2011-02-26 Thread Adrian Buehlmann
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. :) Yep

Re: [Python-Dev] Mercurial conversion repositories

2011-02-25 Thread Adrian Buehlmann
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 in a single