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)." Cheers, Nick. -- Nick Coghlan | ncogh...@gmail.com | Brisbane, Australia --------------------------------------------------------------- _______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
