Merge lp://qastaging/~cmiller/desktopcouch/record-reuse-deleted into lp://qastaging/desktopcouch

Looks good to me

This might be a stupid question, but would't it be better to do:
1. delete in db
2. add to db

rather than:
1. retrieve from db
2. update rev
3. add to db

I know that there is no different when updating the rev of the object, but I fear that:

1. people might be using the rev for something they should not.
2. we are adding an extra response that we really do not care.

Besides this "question" all the rest looks great!

The attempt to merge lp:~cmiller/desktopcouch/record-reuse-deleted into lp:desktopcouch failed.Below is the output from the failed tests.

running build
running build_py
copying desktopcouch/records/record.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/server_base.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/tests/test_server.py -> build/lib.linux-i686-2.6/desktopcouch/records/tests
running build_scripts
running build_i18n
intltool-update -p -g desktopcouch
running build_icons
running clean
Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///tmp/tmp6DVJqO/data/couchdb.html
desktopcouch.bookmarks.tests.test_record
  TestBookmarkRecord
    test_bookmark_record ... [OK]
  TestFeedRecord
    test_feed_record ... [OK]
  TestFolderRecord
    test_folder_record ... [OK]
  TestSeparatorRecord
    test_separator_record ... [OK]
desktopcouch.contacts.tests.test_contactspicker
  TestContactsPicker
    test_can_contruct_contactspicker ... /var/cache/tarmac/desktopcouch/trunk/desktopcouch/contacts/tests/test_contactspicker.py:49: Warning: invalid (NULL) pointer instance
/var/cache/tarmac/desktopcouch/trunk/desktopcouch/contacts/tests/test_contactspicker.py:49: Warning: g_signal_connect_data: assertion `G_TYPE_CHECK_INSTANCE (instance)' failed
/var/cache/tarmac/desktopcouch/trunk/desktopcouch/contacts/tests/test_contactspicker.py:49: GtkWarning: gtk_settings_get_for_screen: assertion `GDK_IS_SCREEN (screen)' failed
/var/cache/tarmac/desktopcouch/trunk/desktopcouch/contacts/tests/test_contactspicker.py:49: Warning: g_object_get: assertion `G_IS_OBJECT (object)' failed
/var/cache/tarmac/desktopcouch/trunk/desktopcouch/contacts/tests/test_contactspicker.py:49: Warning: value "TRUE" of type `gboolean' is invalid or out of range for property `visible' of type `gboolean'
/var/cache/tarmac/desktopcouch/trunk/desktopcouch/contacts/contactspicker.py:39: GtkWarning: gdk_pango_context_get_for_screen: assertion `GDK_IS_SCREEN (screen)' failed
/var/cache/tarmac/desktopcouch/trunk/desktopcouch/contacts/contactspicker.py:39: PangoWarning: pango_context_set_font_description: assertion `context != NULL' failed
/var/cache/tarmac/desktopcouch/trunk/desktopcouch/contacts/contactspicker.py:39: PangoWarning: pango_context_set_base_dir: assertion `context != NULL' failed
/var/cache/tarmac/desktopcouch/trunk/desktopcouch/contacts/contactspicker.py:39: PangoWarning: pango_context_set_language: assertion `context != NULL' failed
/var/cache/tarmac/desktopcouch/trunk/desktopcouch/contacts/contactspicker.py:39: PangoWarning: pango_layout_new: assertion `context != NULL' failed
/var/cache/tarmac/desktopcouch/trunk/desktopcouch/contacts/contactspicker.py:39: PangoWarning: pango_layout_set_attributes: assertion `layout != NULL' failed
/var/cache/tarmac/desktopcouch/trunk/desktopcouch/contacts/contactspicker.py:39: PangoWarning: pango_layout_set_text: assertion `layout != NULL' failed
/var/cache/tarmac/de...

I can't reproduce that tarmac+tests failure. Retrying.