[Python-Dev] Please sync your feature branches

[Antoine Pitrou]

On Mon, 28 Feb 2011 23:54:46 +0100
"Martin v. Löwis" <martin at v.loewis.de> wrote:
> Am 28.02.2011 23:45, schrieb Antoine Pitrou:
> > Le lundi 28 février 2011 à 23:26 +0100, "Martin v. Löwis" a écrit :
> >>> In preparation for the hg switch, I would recommend that, if you have
> >>> any feature branches managed with svnmerge, you sync them with the py3k
> >>> branch before we switch. That way, it will make it easier to "bridge
> >>> the gap" when you create a new repository for your work after the
> >>> switch (the svnmerge information isn't retained in the converted repo).
> >>
> >> Is that really going to work? I.e. will Mercurial be able to merge from
> >> default to one of the feature branches? If so, what will be the
> >> procedure? What would be the exact steps to try this out on the PEP 382
> >> branch (say)?
> > 
> > I've sketched out the steps in
> > http://potrou.net/hgdevguide/committing.html#long-term-development-of-features
> > 
> > It doesn't cover importing work from SVN
> 
> But that's what I was specifically asking about: if I svnmerge my
> feature branch now - what specifically do I gain? Why are you asking
> me to do that? Why does doing so make it easier to "bridge the gap"?

Because you don't have to find whichever faraway changeset on which to
base your initial changes. You can just apply your patch on the latest
"default" changeset in the Mercurial repository and, in all likelihood,
you won't get any conflicts.

Regards

Antoine.