Re: [python-committers] svnmerge init on py3k branch fails..

2010-03-23 Thread Brett Cannon
On Tue, Mar 23, 2010 at 08:13, Nick Coghlan wrote: > Victor Stinner wrote: > > It's look like the repository is ok. > > I confirmed this by looking at what Senthil's commit actually did on the > Python 2.6 branch - it just added some redundant info to the beginning > of the svnmerge-integrated pr

Re: [python-committers] svnmerge init on py3k branch fails..

2010-03-23 Thread Jesus Cea
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 03/23/2010 04:13 PM, Nick Coghlan wrote: > I'm not sure if there should be any change in the wording of the FAQ > entry for this - maybe expanding on the last sentence a bit? > > Current: "This is a one-time operation." > Possible change: "This is

Re: [python-committers] svnmerge init on py3k branch fails..

2010-03-23 Thread Eric Smith
Alexandre Vassalotti wrote: On Tue, Mar 23, 2010 at 11:13 AM, Nick Coghlan wrote: I'm not sure if there should be any change in the wording of the FAQ entry for this - maybe expanding on the last sentence a bit? Could we put a commit hook to prevent committing unintentional "svnmerge.py init

Re: [python-committers] svnmerge init on py3k branch fails..

2010-03-23 Thread Alexandre Vassalotti
On Tue, Mar 23, 2010 at 11:13 AM, Nick Coghlan wrote: > I'm not sure if there should be any change in the wording of the FAQ > entry for this - maybe expanding on the last sentence a bit? > Could we put a commit hook to prevent committing unintentional "svnmerge.py init"? -- Alexandre __

Re: [python-committers] svnmerge init on py3k branch fails..

2010-03-23 Thread R. David Murray
On Wed, 24 Mar 2010 01:13:54 +1000, Nick Coghlan wrote: > I'm not sure if there should be any change in the wording of the FAQ > entry for this - maybe expanding on the last sentence a bit? > > Current: "This is a one-time operation." > Possible change: "This is a one-time operation (i.e. only wh

Re: [python-committers] svnmerge init on py3k branch fails..

2010-03-23 Thread Nick Coghlan
Victor Stinner wrote: > It's look like the repository is ok. I confirmed this by looking at what Senthil's commit actually did on the Python 2.6 branch - it just added some redundant info to the beginning of the svnmerge-integrated property. As that redundant info is no longer present, I expect s

Re: [python-committers] svnmerge init on py3k branch fails..

2010-03-23 Thread Victor Stinner
Le mardi 23 mars 2010 12:00:15, vous avez écrit : > On Tue, Mar 23, 2010 at 3:57 PM, Victor Stinner > > wrote: > > Why are you using svn init? It was already done in all branches. > > I had this understanding that, while using svnmerge.py you might to do > one-time operation on svnmerge.py init

Re: [python-committers] svnmerge init on py3k branch fails..

2010-03-23 Thread Senthil Kumaran
On Tue, Mar 23, 2010 at 3:57 PM, Victor Stinner wrote: > Why are you using svn init? It was already done in all branches. I had this understanding that, while using svnmerge.py you might to do one-time operation on svnmerge.py init on local repo and then do the svnmerge.py merge -r xxx http://ww

Re: [python-committers] svnmerge init on py3k branch fails..

2010-03-23 Thread Victor Stinner
Le mardi 23 mars 2010 10:42:00, Senthil Kumaran a écrit : > I had to reinstall my OS recently and I checked out pristine copies of > trunk,py3k,release26-maint,release31-maint. > > While svnmerge.py init on release26-maint and release31-maint worked > fine and I was able to merge a revision to rel

[python-committers] svnmerge init on py3k branch fails..

2010-03-23 Thread Senthil Kumaran
I had to reinstall my OS recently and I checked out pristine copies of trunk,py3k,release26-maint,release31-maint. While svnmerge.py init on release26-maint and release31-maint worked fine and I was able to merge a revision to release26-maint. On py3k, the svn init gave the following problem. $