Pardon my general n00bishness, but I crave knowledge. IIUC currently if
you have a checkin in trunk that you *don't* want merged into py3k, you
must svnmerge block it in py3k. Otherwise it will be automatically
merged at some point.
My question is: when will we stop doing that? I assume
Le mardi 27 avril 2010 à 03:23 -0700, Larry Hastings a écrit :
>
> Pardon my general n00bishness, but I crave knowledge. IIUC currently if
> you have a checkin in trunk that you *don't* want merged into py3k, you
> must svnmerge block it in py3k. Otherwise it will be automatically
> merged at
On 27/04/2010 11:38, Antoine Pitrou wrote:
Le mardi 27 avril 2010 à 03:23 -0700, Larry Hastings a écrit :
Pardon my general n00bishness, but I crave knowledge. IIUC currently if
you have a checkin in trunk that you *don't* want merged into py3k, you
must svnmerge block it in py3k. Otherwis
Michael Foord wrote:
Allegedly merging between branches will be easier with Mercurial anyway...
I hope an Hg expert can show how this can be done...
In particular, we don't want to pull all changes to 2.7 into 3k, and I
haven't seen any sane way in Hg to say "just pull this changeset, no
oth
Le mardi 27 avril 2010 à 14:01 +0100, Chris Withers a écrit :
> Michael Foord wrote:
> > Allegedly merging between branches will be easier with Mercurial anyway...
>
> I hope an Hg expert can show how this can be done...
>
> In particular, we don't want to pull all changes to 2.7 into 3k, and I
On Tue, 27 Apr 2010 03:23:59 -0700, Larry Hastings wrote:
> My guess is that more checkins are blocked than are allowed through. So
> when will we stop the automerging?
As Antoine said, there is no automerging. As for the number of commits
that get ported to py3k, it is almost all of them. On
> Pardon my general n00bishness, but I crave knowledge. IIUC currently if
> you have a checkin in trunk that you *don't* want merged into py3k, you
> must svnmerge block it in py3k. Otherwise it will be automatically
> merged at some point.
>
> My question is: when will we stop doing that?
Nobo
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
On 27/04/10 15:01, Chris Withers wrote:
> Michael Foord wrote:
>> Allegedly merging between branches will be easier with Mercurial
>> anyway...
>
> I hope an Hg expert can show how this can be done...
>
> In particular, we don't want to pull all chan
