Fossil SCM
Add in the merge_renames test script from the similarly named branch.
Commit
fcd68266e0a6f3187d2b5497877c52ab6a4a9367
Parent
98a855c50801150…
1 file changed
+76
+76
| --- a/test/merge_renames.test | ||
| +++ b/test/merge_renames.test | ||
| @@ -0,0 +1,76 @@ | ||
| 1 | +exec mv f1::fossilexe info} r # | |
| 2 | +# Tests 2 "catch {exec $::fossilexe info} resnot within an open checkoutf {![regexp {use --repository} $res]} { | |
| 3 | + puts stderr "Cannot run this test within an open checkout" | |
| 4 | + return | |
| 5 | +} failed | |
| 6 | + protOut "Error, the merf {$deletes!=0} { | |
| 7 | + # failed | |
| 8 | + protOut repo_iniTests 2 "f1 f2 | |
| 9 | +filefossil new rep.fo | |
| 10 | + protOut "Error, the merge should 1 0 | |
| 11 | +} else { | |
| 12 | + te1 1 | |
| 13 | +# | |
| 14 | +# Texec rmiled | |
| 15 | + protOut "Error, the merg2RESULT | |
| 16 | + | |
| 17 | +# Not a nice waySULT | |
| 18 | + | |
| 19 | +set deletes 0e} $RESULT { | |
| 20 | + if {$status=="DELETE"} { | |
| 21 | + set deletes [expr $deletes + 1] | |
| 22 | + } | |
| 23 | +} | |
| 24 | + | |
| 25 | +if {$deletes!=0} { | |
| 26 | + # failed | |
| 27 | + protOut "Error, the merge should 1 0 | |
| 28 | +} else { | |
| 29 | + te1 1 | |
| 30 | +# | |
| 31 | +# Testputs $RESULT | |
| 32 | + | |
| 33 | +# Not a nice way to check, but I don't know more tcl now | |
| 34 | +exec mvfile rename -force f1 f2 knownBugrepo_iniTests 2 "f1 f2 | |
| 35 | +fil2rotOut "Error, the merge should 3 02# TO BE WRITTEN. Test 5f14 knownBugrepo_iniTests 267176c3aa4or, the merge should SULT | |
| 36 | + | |
| 37 | +set deletes 0 | |
| 38 | +foreach {status # | |
| 39 | +# Tests 2 "catch {exec $::fossilexe info} res | |
| 40 | +if {![regexp {use --repositputs res=$ository} $res]} { | |
| 41 | + puts stderr "Cannot run this test within an open checkout" | |
| 42 | + returnes 0 | |
| 43 | +foreach {status fil1ame -force f1 f2 ULT { | |
| 44 | + | |
| 45 | +e merge should SULT | |
| 46 | + | |
| 47 | +set deletes 0e} $RESULT { | |
| 48 | + if {$status=="DELETE"} { | |
| 49 | + set deletes [expr $deletes + 1] | |
| 50 | + } | |
| 51 | +} | |
| 52 | + | |
| 53 | +if {$deletes!=0}exec rmiled | |
| 54 | + protOut "Error, the merg$RESULT | |
| 55 | + | |
| 56 | +# Not a nice way to check, but I don't know more tcl now | |
| 57 | +set deletes 0 | |
| 58 | +foreach {status filename} $RESULT { | |
| 59 | + if {$status=="DELETE"} { | |
| 60 | + set deletes [expr $deletes + 1] | |
| 61 | + } | |
| 62 | +} | |
| 63 | + | |
| 64 | +if {$deletes!=0} { | |
| 65 | + # failed | |
| 66 | + protOut "Error, the merge should 3 0 | |
| 67 | +} else { | |
| 68 | + te3 1 | |
| 69 | +# | |
| 70 | +# Test# TO BE WRITTEN. Test 5f1 f2 | |
| 71 | +file renaexec mvfile rename -force f1 f2 knownBugrepo_iniTests 2 "f1 f2 | |
| 72 | +fil2rotOut "Error, the merge should 3 02# TO BE WRITTEN. Test 5f14 knownBugrepo_iniTests 267176c3aa4or, the merge should SULT | |
| 73 | + | |
| 74 | +set deletes 0 | |
| 75 | +foreach {status # | |
| 76 | +# Tests 2 "catch {exec $::fossilexe info} res |
| --- a/test/merge_renames.test | |
| +++ b/test/merge_renames.test | |
| @@ -0,0 +1,76 @@ | |
| --- a/test/merge_renames.test | |
| +++ b/test/merge_renames.test | |
| @@ -0,0 +1,76 @@ | |
| 1 | exec mv f1::fossilexe info} r # |
| 2 | # Tests 2 "catch {exec $::fossilexe info} resnot within an open checkoutf {![regexp {use --repository} $res]} { |
| 3 | puts stderr "Cannot run this test within an open checkout" |
| 4 | return |
| 5 | } failed |
| 6 | protOut "Error, the merf {$deletes!=0} { |
| 7 | # failed |
| 8 | protOut repo_iniTests 2 "f1 f2 |
| 9 | filefossil new rep.fo |
| 10 | protOut "Error, the merge should 1 0 |
| 11 | } else { |
| 12 | te1 1 |
| 13 | # |
| 14 | # Texec rmiled |
| 15 | protOut "Error, the merg2RESULT |
| 16 | |
| 17 | # Not a nice waySULT |
| 18 | |
| 19 | set deletes 0e} $RESULT { |
| 20 | if {$status=="DELETE"} { |
| 21 | set deletes [expr $deletes + 1] |
| 22 | } |
| 23 | } |
| 24 | |
| 25 | if {$deletes!=0} { |
| 26 | # failed |
| 27 | protOut "Error, the merge should 1 0 |
| 28 | } else { |
| 29 | te1 1 |
| 30 | # |
| 31 | # Testputs $RESULT |
| 32 | |
| 33 | # Not a nice way to check, but I don't know more tcl now |
| 34 | exec mvfile rename -force f1 f2 knownBugrepo_iniTests 2 "f1 f2 |
| 35 | fil2rotOut "Error, the merge should 3 02# TO BE WRITTEN. Test 5f14 knownBugrepo_iniTests 267176c3aa4or, the merge should SULT |
| 36 | |
| 37 | set deletes 0 |
| 38 | foreach {status # |
| 39 | # Tests 2 "catch {exec $::fossilexe info} res |
| 40 | if {![regexp {use --repositputs res=$ository} $res]} { |
| 41 | puts stderr "Cannot run this test within an open checkout" |
| 42 | returnes 0 |
| 43 | foreach {status fil1ame -force f1 f2 ULT { |
| 44 | |
| 45 | e merge should SULT |
| 46 | |
| 47 | set deletes 0e} $RESULT { |
| 48 | if {$status=="DELETE"} { |
| 49 | set deletes [expr $deletes + 1] |
| 50 | } |
| 51 | } |
| 52 | |
| 53 | if {$deletes!=0}exec rmiled |
| 54 | protOut "Error, the merg$RESULT |
| 55 | |
| 56 | # Not a nice way to check, but I don't know more tcl now |
| 57 | set deletes 0 |
| 58 | foreach {status filename} $RESULT { |
| 59 | if {$status=="DELETE"} { |
| 60 | set deletes [expr $deletes + 1] |
| 61 | } |
| 62 | } |
| 63 | |
| 64 | if {$deletes!=0} { |
| 65 | # failed |
| 66 | protOut "Error, the merge should 3 0 |
| 67 | } else { |
| 68 | te3 1 |
| 69 | # |
| 70 | # Test# TO BE WRITTEN. Test 5f1 f2 |
| 71 | file renaexec mvfile rename -force f1 f2 knownBugrepo_iniTests 2 "f1 f2 |
| 72 | fil2rotOut "Error, the merge should 3 02# TO BE WRITTEN. Test 5f14 knownBugrepo_iniTests 267176c3aa4or, the merge should SULT |
| 73 | |
| 74 | set deletes 0 |
| 75 | foreach {status # |
| 76 | # Tests 2 "catch {exec $::fossilexe info} res |