Fossil SCM
Fixing the merge5 test, for it to run when out of a checkout. The same kind of fix as [0a7ab3ccb0].
Commit
e46be99ff4fdd58089d8652e81e32bb9a3c733f0
Parent
bf480a29a6877be…
1 file changed
+1
-1
+1
-1
| --- test/merge5.test | ||
| +++ test/merge5.test | ||
| @@ -38,11 +38,11 @@ | ||
| 38 | 38 | } |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | catch {exec $::fossilexe info} res |
| 42 | 42 | puts res=$res |
| 43 | -if {![regexp {not within an open checkout} $res]} { | |
| 43 | +if {![regexp {use --repository} $res]} { | |
| 44 | 44 | puts stderr "Cannot run this test within an open checkout" |
| 45 | 45 | return |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | # Construct a test repository |
| 49 | 49 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -38,11 +38,11 @@ | |
| 38 | } |
| 39 | } |
| 40 | |
| 41 | catch {exec $::fossilexe info} res |
| 42 | puts res=$res |
| 43 | if {![regexp {not within an open checkout} $res]} { |
| 44 | puts stderr "Cannot run this test within an open checkout" |
| 45 | return |
| 46 | } |
| 47 | |
| 48 | # Construct a test repository |
| 49 |
| --- test/merge5.test | |
| +++ test/merge5.test | |
| @@ -38,11 +38,11 @@ | |
| 38 | } |
| 39 | } |
| 40 | |
| 41 | catch {exec $::fossilexe info} res |
| 42 | puts res=$res |
| 43 | if {![regexp {use --repository} $res]} { |
| 44 | puts stderr "Cannot run this test within an open checkout" |
| 45 | return |
| 46 | } |
| 47 | |
| 48 | # Construct a test repository |
| 49 |