Simon Willison’s Weblog


2 items tagged “merge”


newforms-admin branch has been merged into trunk. Congrats to Brian Rosner for the merge. django.newforms has been renamed to django.forms as well—1.0 grows ever closer. # 20th July 2008, 11:17 pm

Undo commit in subversion. svn merge -r 1708:1707—I can never remember how to do this. # 3rd January 2008, 4:43 pm