Home Original page

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

Brett Cannon brett at python.org
Tue Mar 23 20:00:07 CET 2010 
On Tue, Mar 23, 2010 at 08:13, Nick Coghlan <ncoghlan at gmail.com> 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 property.
>
> As that redundant info is no longer present, I expect svnmerge cleared
> it out on a subsequent merge command.
>
> 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 when the
> branch is originally created, not when each developer creates a local
> checkout for the branch)."
>

Done.

-Brett



>
> Cheers,
> Nick.
>
> --
> Nick Coghlan   |   ncoghlan at gmail.com   |   Brisbane, Australia
> ---------------------------------------------------------------
> _______________________________________________
> python-committers mailing list
> python-committers at python.org
> http://mail.python.org/mailman/listinfo/python-committers
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/python-committers/attachments/20100323/8fde7864/attachment.html>
More information about the python-committers mailing list