Hi,
since the 2.7 commits now go to release27-maint, I've added svnmerge tracking
from this branch to release26-maint. From now on, if you want to backport a
commit to 2.6 you have to select the source manually via
svnmerge merge -S /python/trunk -rREV
or
svnmerge merge -S /python/branches/rel
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
-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
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
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
__
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
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
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
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
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
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.
$
Antoine Pitrou schrieb:
> Le dimanche 01 mars 2009 à 21:08 +0100, "Martin v. Löwis" a écrit :
>> I meant that as a relative qualification indeed (merging a single
>> revision specified on the command line as opposed to merging all
>> available versions).
>>
>> I just measured merging r70081, and it
Le dimanche 01 mars 2009 à 21:08 +0100, "Martin v. Löwis" a écrit :
> I meant that as a relative qualification indeed (merging a single
> revision specified on the command line as opposed to merging all
> available versions).
>
> I just measured merging r70081, and it took 42s.
After the merge fr
13 matches
Mail list logo
