Re: [Python-Dev] git repositories for trunk and py3k

2008-07-18 Thread Brett Cannon
On Fri, Jul 18, 2008 at 12:54 PM, Bill Janssen <[EMAIL PROTECTED]> wrote: > Why is it you're trying to use "git"? Neil set up a mirror and I was curious. Same with the bzr mirror. -Brett ___ Python-Dev mailing list Python-Dev@python.org http://mail.pyth

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-18 Thread Bill Janssen
Why is it you're trying to use "git"? Bill ___ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-18 Thread Brett Cannon
On Fri, Jul 18, 2008 at 12:35 PM, Neil Schemenauer <[EMAIL PROTECTED]> wrote: > On Fri, Jul 18, 2008 at 12:07:19PM -0700, Brett Cannon wrote: >> I lied. Trying again complained about Mac/IDLE/Makefile.in which I >> have not touched, nor is it listed as changed. > > I think you are running into the

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-18 Thread Neil Schemenauer
On Fri, Jul 18, 2008 at 12:07:19PM -0700, Brett Cannon wrote: > I lied. Trying again complained about Mac/IDLE/Makefile.in which I > have not touched, nor is it listed as changed. I think you are running into the fact that the git tree on code.python.org is only updated every 30 minutes. Using th

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-18 Thread Brett Cannon
On Fri, Jul 18, 2008 at 12:31 PM, Neil Schemenauer <[EMAIL PROTECTED]> wrote: > On Fri, Jul 18, 2008 at 11:57:21AM -0700, Brett Cannon wrote: >> I figured this out. I just did ``git reset --hard``, did the proper >> "fetch;rebase" dance, resolved the conflict, did ``git add`` and then >> continued

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-18 Thread Neil Schemenauer
On Fri, Jul 18, 2008 at 11:57:21AM -0700, Brett Cannon wrote: > I figured this out. I just did ``git reset --hard``, did the proper > "fetch;rebase" dance, resolved the conflict, did ``git add`` and then > continued with the rebase. It all looks fine now. Doing a fetch followed by a rebase is simi

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-18 Thread Brett Cannon
On Fri, Jul 18, 2008 at 11:57 AM, Brett Cannon <[EMAIL PROTECTED]> wrote: > On Fri, Jul 18, 2008 at 11:37 AM, Brett Cannon <[EMAIL PROTECTED]> wrote: >> On Fri, Jul 18, 2008 at 11:12 AM, Brett Cannon <[EMAIL PROTECTED]> wrote: >>> On Thu, Jul 17, 2008 at 11:54 PM, Neil Schemenauer <[EMAIL PROTECTED

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-18 Thread Neil Schemenauer
On Fri, Jul 18, 2008 at 11:12:41AM -0700, Brett Cannon wrote: > >git log git-svn.. > > And those two periods are significant for people who think they are > line noise. Damn is Git quirky. I guess it would have been clearer if I had used "git-svn..HEAD". The ".." is similar to SVN's ":" so I

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-18 Thread Brett Cannon
On Fri, Jul 18, 2008 at 11:37 AM, Brett Cannon <[EMAIL PROTECTED]> wrote: > On Fri, Jul 18, 2008 at 11:12 AM, Brett Cannon <[EMAIL PROTECTED]> wrote: >> On Thu, Jul 17, 2008 at 11:54 PM, Neil Schemenauer <[EMAIL PROTECTED]> wrote: >>> [back on the list] >>> >>> On Thu, Jul 17, 2008 at 11:24:16PM -0

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-18 Thread A.M. Kuchling
On Fri, Jul 18, 2008 at 11:12:41AM -0700, Brett Cannon wrote: > And those two periods are significant for people who think they are > line noise. Damn is Git quirky. Oh my, yes. We use git at work; there's a reason I now use Bazaar for personal projects. > I assume the ^ operator means "just bef

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-18 Thread Brett Cannon
On Fri, Jul 18, 2008 at 11:12 AM, Brett Cannon <[EMAIL PROTECTED]> wrote: > On Thu, Jul 17, 2008 at 11:54 PM, Neil Schemenauer <[EMAIL PROTECTED]> wrote: >> [back on the list] >> >> On Thu, Jul 17, 2008 at 11:24:16PM -0700, Brett Cannon wrote: >>> Turned out to be a rebuild:: >>> >>> >>> r6507

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-18 Thread Brett Cannon
On Thu, Jul 17, 2008 at 11:54 PM, Neil Schemenauer <[EMAIL PROTECTED]> wrote: > [back on the list] > > On Thu, Jul 17, 2008 at 11:24:16PM -0700, Brett Cannon wrote: >> Turned out to be a rebuild:: >> >> >> r65077 = 82d954e8c20c91562c4c660859d17756cba10992 >> r65082 = 1c75cce93c2ef2ec87e8018886

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-17 Thread Neil Schemenauer
[back on the list] On Thu, Jul 17, 2008 at 11:24:16PM -0700, Brett Cannon wrote: > Turned out to be a rebuild:: > > > r65077 = 82d954e8c20c91562c4c660859d17756cba10992 > r65082 = 1c75cce93c2ef2ec87e801888638cfdf5d2ff29a > r65085 = 3143c2fbe7315afd29496dc0cdac3122bed30536 > Done rebuilding .g

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-17 Thread Brett Cannon
On Tue, Jul 15, 2008 at 2:31 PM, Neil Schemenauer <[EMAIL PROTECTED]> wrote: > Benjamin Peterson <[EMAIL PROTECTED]> wrote: >> Can we push branches? > > The git-daemon is setup as read-only. If you have write access to > the SVN repository then you can push back changes using git-svn. > That's qui

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-15 Thread Neil Schemenauer
Benjamin Peterson <[EMAIL PROTECTED]> wrote: > Can we push branches? The git-daemon is setup as read-only. If you have write access to the SVN repository then you can push back changes using git-svn. That's quite a nice way to work, IMHO and provides an easy path for people who are used to Subver

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-15 Thread Brett Cannon
On Tue, Jul 15, 2008 at 1:04 PM, Neil Schemenauer <[EMAIL PROTECTED]> wrote: > On Mon, Jul 14, 2008 at 09:31:47PM -0400, Barry Warsaw wrote: >> Neil, we should try to host them on code.python.org. > > I was hoping to get a sense of the interest. Oh well, if you build > it they might come. ;-) I've

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-15 Thread Benjamin Peterson
On Tue, Jul 15, 2008 at 3:04 PM, Neil Schemenauer <[EMAIL PROTECTED]> wrote: > On Mon, Jul 14, 2008 at 09:31:47PM -0400, Barry Warsaw wrote: >> Neil, we should try to host them on code.python.org. > > I was hoping to get a sense of the interest. Oh well, if you build > it they might come. ;-) I've

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-15 Thread Neil Schemenauer
On Mon, Jul 14, 2008 at 09:31:47PM -0400, Barry Warsaw wrote: > Neil, we should try to host them on code.python.org. I was hoping to get a sense of the interest. Oh well, if you build it they might come. ;-) I've written draft instructions, temporarily at .

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-15 Thread Barry Warsaw
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Jul 15, 2008, at 6:41 AM, Paul Moore wrote: On 15/07/2008, Barry Warsaw <[EMAIL PROTECTED]> wrote: In case anyone is interested, I have git repositories for both the trunk and the py3k branch of the Python source code. They are up-to-date and s

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-15 Thread Paul Moore
On 15/07/2008, Barry Warsaw <[EMAIL PROTECTED]> wrote: > > In case anyone is interested, I have git repositories for both the > > trunk and the py3k branch of the Python source code. They are > > up-to-date and so using them with git-svn would be much faster than > > starting from scratch. > > > >

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-14 Thread Barry Warsaw
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On Jul 14, 2008, at 6:43 PM, Neil Schemenauer wrote: In case anyone is interested, I have git repositories for both the trunk and the py3k branch of the Python source code. They are up-to-date and so using them with git-svn would be much faster tha

Re: [Python-Dev] git repositories for trunk and py3k

2008-07-14 Thread Brett Cannon
On Mon, Jul 14, 2008 at 3:43 PM, Neil Schemenauer <[EMAIL PROTECTED]> wrote: > Hi, > > In case anyone is interested, I have git repositories for both the > trunk and the py3k branch of the Python source code. They are > up-to-date and so using them with git-svn would be much faster than > starting

[Python-Dev] git repositories for trunk and py3k

2008-07-14 Thread Neil Schemenauer
Hi, In case anyone is interested, I have git repositories for both the trunk and the py3k branch of the Python source code. They are up-to-date and so using them with git-svn would be much faster than starting from scratch. If anyone is interested, I will find a place to host them. They are eac