Le mardi 23 mars 2010 12:00:15, vous avez écrit :
On Tue, Mar 23, 2010 at 3:57 PM, Victor Stinner
victor.stinner@haypocalc.com 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://www.python.org/dev/faq/#how-do-i-prepare-a-new-branch-for-merging
"You need to initialize a *new branch* ...": release26-maint and release31- maint are not new branches ;-)
Now that i have done it release26-maint and release31-maint, does it create any problem?
svnmerge.py uses two 2 properties (svnmerge-blocked and svnmerge-integrated) on the directory.
Let's try on a fresh release26-maint checkout:
$ svn pl . Propriétés sur '.' svn:ignore svnmerge-blocked svnmerge-integrated svk:merge
$ svn pg svnmerge-integrated . /python/trunk:1-66720,66723-66743,66746-66751,66753-66755,...,79311,79325,79329
$ svn pg svnmerge-blocked . /python/trunk:66721-66722,66744-66745,...,79208,79294
It's look like the repository is ok. If you loose and cleared these properties in your local checkout, use "svn revert ." to restore the properties.
-- Victor Stinner http://www.haypocalc.com/