Confirming a merge as non-destructive

It worked this time, anyway. Reviewed the diff (for two different revisions? brain/memory not working), and then when it appeared none of the changes conflicted, ran the subversion update.

-bash-3.00$ svn diff sites/default/modules/change_agents/user_profiles/user_profiles.module

Index: sites/default/modules/change_agents/user_profiles/user_profiles.module

--- sites/default/modules/change_agents/user_profiles/user_profiles.module (revision 760)
+++ sites/default/modules/change_agents/user_profiles/user_profiles.module (working copy)
@@ -353,10 +353,14 @@
$form['picture']['picture_upload']['#tip'] = $form['picture']['picture_upload']['#description'];
unset($form['picture']['picture_upload']['#description']);
}
+
+ unset($form['privatemsg_settings']['privatemsg_allow']);
+ /*
if($form['privatemsg_settings']['privatemsg_allow']['#description']) {
$form['privatemsg_settings']['privatemsg_allow']['#tip'] = $form['privatemsg_settings']['privatemsg_allow']['#description'];
unset($form['privatemsg_settings']['privatemsg_allow']['#description']);
}
+ */
if($form['privatemsg_settings']['privatemsg_setmessage_notify']['#description']) {
$form['privatemsg_settings']['privatemsg_setmessage_notify']['#tip'] = $form['privatemsg_settings']['privatemsg_setmessage_notify']['#description'];
unset($form['privatemsg_settings']['privatemsg_setmessage_notify']['#description']);

--- sites/default/modules/change_agents/user_profiles/user_profiles.module (revision 856)
+++ sites/default/modules/change_agents/user_profiles/user_profiles.module (working copy)
@@ -353,10 +353,14 @@
$form['picture']['picture_upload']['#tip'] = $form['picture']['picture_upload']['#description'];
unset($form['picture']['picture_upload']['#description']);
}
+
+ unset($form['privatemsg_settings']['privatemsg_allow']);
+ /*
if($form['privatemsg_settings']['privatemsg_allow']['#description']) {
$form['privatemsg_settings']['privatemsg_allow']['#tip'] = $form['privatemsg_settings']['privatemsg_allow']['#description'];
unset($form['privatemsg_settings']['privatemsg_allow']['#description']);
}
+ */
if($form['privatemsg_settings']['privatemsg_setmessage_notify']['#description']) {
$form['privatemsg_settings']['privatemsg_setmessage_notify']['#tip'] = $form['privatemsg_settings']['privatemsg_setmessage_notify']['#description'];
unset($form['privatemsg_settings']['privatemsg_setmessage_notify']['#description']);

-bash-3.00$ sudo svn update sites/default/modules/change_agents/user_profiles/user_profiles.module
Password:
G sites/default/modules/change_agents/user_profiles/user_profiles.module
Updated to revision 856.
-bash-3.00$ sudo svn commit -m "changes merged" sites/default/modules/change_agents/user_profiles/user_profiles.module
Sending sites/default/modules/change_agents/user_profiles/user_profiles.module
Transmitting file data .
Committed revision 857.

Resolution