Georg Brandl schrieb: > I just wanted to merge a series of commits to py3k where the first > added a new file, and the others changed it. Output was: > > property 'svnmerge-integrated' deleted from '.'. > > > > property 'svnmerge-blocked' deleted from '.'. > > --- Merging r71409 into '.': > A Doc/tools/sphinxext/static/basic.css > > svnmerge: command execution failed (exit code: 1) > svn --non-interactive propdel "svnmerge-integrated" "." > svn: Attempting to delete nonexistent property 'svnmerge-integrated'
PS: Updating svnmerge from http://svn.collab.net/viewvc/svn/trunk/contrib/client-side/svnmerge/svnmerge.py seems to have fixed this particular problem. Georg _______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
