Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r1572 - trunk: . fsvs/tests

fsvs
Discussion topic

Back to topic list

svn commit: r1572 - trunk: . fsvs/tests

Author pmarek
Full name P.Marek
Date 2008-04-01 22:22:42 PDT
Message Author: pmarek
Date: 2008-04-01 22:22:41-0700
New Revision: 1572

Modified:
   trunk/ (props changed)
   trunk/fsvs/tests/053_conflicts

Log:
-d must not be used unconditionally in the tests - they run with release
builds, too.




Modified: trunk/fsvs/tests/053_conflicts
Url: http://fsvs.tigris.o​rg/source/browse/fsv​s/trunk/fsvs/tests/0​53_conflicts?view=di​ff&rev=1572&​p1=trunk/fsvs/tests/​053_conflicts&p2​=trunk/fsvs/tests/05​3_conflicts&r1=1​571&r2=1572
====================​====================​====================​==================
--- trunk/fsvs/tests/053_conflicts (original)
+++ trunk/fsvs/tests/053_conflicts 2008-04-01 22:22:41-0700
@@ -201,7 +201,7 @@
 
 # Now do a conflict
 cat will_conflict > $target
-$BINq up -o conflict=merge -d > $logfile
+$BINq up -o conflict=merge > $logfile
 if ! cmp $target merged_conflict
 then
     diff -u $target merged_conflict

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r1572 - trunk: . fsvs/tests pmarek P.Marek 2008-04-01 22:22:42 PDT
Messages per page: