http://simonwillison.net/2008-07-20T23:17:11+00:00Simon Willison2008-07-20T23:17:11+00:002008-07-20T23:17:11+00:00https://simonwillison.net/2008/Jul/20/merge/#atom-tag

<p><strong><a href="http://groups.google.com/group/django-users/browse_thread/thread/53ace41d27dfa7d9">newforms-admin branch has been merged into trunk</a></strong></p> Congrats to Brian Rosner for the merge. django.newforms has been renamed to django.forms as well—1.0 grows ever closer. <p>Tags: <a href="https://simonwillison.net/tags/brian-rosner">brian-rosner</a>, <a href="https://simonwillison.net/tags/django">django</a>, <a href="https://simonwillison.net/tags/django-admin">django-admin</a>, <a href="https://simonwillison.net/tags/forms">forms</a>, <a href="https://simonwillison.net/tags/merge">merge</a>, <a href="https://simonwillison.net/tags/newformsadmin">newformsadmin</a></p>

2008-01-03T16:43:21+00:002008-01-03T16:43:21+00:00https://simonwillison.net/2008/Jan/3/undo/#atom-tag

<p><strong><a href="http://noehr.org/2007/12/undo_commit_in_subversion_svn_1.html">Undo commit in subversion</a></strong></p> svn merge -r 1708:1707—I can never remember how to do this. <p>Tags: <a href="https://simonwillison.net/tags/merge">merge</a>, <a href="https://simonwillison.net/tags/subversion">subversion</a>, <a href="https://simonwillison.net/tags/svn">svn</a>, <a href="https://simonwillison.net/tags/undo">undo</a></p>