[Bps-public-commit] r11292 - in SVN-PropDB: .

[jesse at bestpractical.com]

Author: jesse
Date: Mon Mar 31 05:06:52 2008
New Revision: 11292

Modified:
   SVN-PropDB/   (props changed)
   SVN-PropDB/t/simple-conflicting-merge.t

Log:
 r28830 at 68-246-241-50:  jesse | 2008-03-30 22:36:27 -1000
 


Modified: SVN-PropDB/t/simple-conflicting-merge.t
==============================================================================
--- SVN-PropDB/t/simple-conflicting-merge.t	(original)
+++ SVN-PropDB/t/simple-conflicting-merge.t	Mon Mar 31 05:06:52 2008
@@ -98,11 +98,11 @@
     is($prop_changes[0]->old_value, 'stalled');
     is($prop_changes[0]->new_value, 'new');
     
+    
+    # make sure 
 
     # Throw away the return. we wanted to inspect the conflict but not apply anything
 
-
-my $repo = repo_uri_for('bob');
 diag `svn log -v $repo`;