I just committed Ariel's csd changes to the 99 branch, and when I attempted to merge I first got a failure and now the branch is not showing up in the available branches. Any ideas? The branch was listed on a 'svnmerge.py merge' command *before* the failure.
jdhun...@uqbar:mpl> svnmerge.py merge /home/jdhunter/dev/bin/svnmerge.py:71: DeprecationWarning: The popen2 module is deprecated. Use the subprocess module. import sys, os, getopt, re, types, tempfile, time, popen2, locale svnmerge: multiple sources found. Explicit source argument (-S/--source) required. The merge sources available are: /branches/v0_99_maint /branches/mathtex jdhun...@uqbar:mpl> svnmerge.py merge -Sv0_99_maint /home/jdhunter/dev/bin/svnmerge.py:71: DeprecationWarning: The popen2 module is deprecated. Use the subprocess module. import sys, os, getopt, re, types, tempfile, time, popen2, locale property 'svnmerge-integrated' set on '.' svnmerge: command execution failed (exit code: 1) svn --non-interactive propdel "svnmerge-blocked" "." svn: Attempting to delete nonexistent property 'svnmerge-blocked' jdhun...@uqbar:mpl> svnmerge.py merge -Sv0_99_maint /home/jdhunter/dev/bin/svnmerge.py:71: DeprecationWarning: The popen2 module is deprecated. Use the subprocess module. import sys, os, getopt, re, types, tempfile, time, popen2, locale svnmerge: "v0_99_maint" is neither a valid URL, nor an unambiguous substring of a repository path, nor a working directory jdhun...@uqbar:mpl> svnmerge.py merge /home/jdhunter/dev/bin/svnmerge.py:71: DeprecationWarning: The popen2 module is deprecated. Use the subprocess module. import sys, os, getopt, re, types, tempfile, time, popen2, locale svnmerge: multiple sources found. Explicit source argument (-S/--source) required. The merge sources available are: /branches/v0_91_maint /branches/mathtex /branches/v0_98_5_maint ------------------------------------------------------------------------------ The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
