Georg Brandl g.brandl at gmx.net
Fri Apr 10 09:19:57 CEST 2009

• Previous message: [python-committers] bug in svnmerge w.r.t. new files
• Next message: [python-committers] Python 2.6.2
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

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

---

• Previous message: [python-committers] bug in svnmerge w.r.t. new files
• Next message: [python-committers] Python 2.6.2
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

More information about the python-committers mailing list