Fossil SCM

More comments about tests I'd like to write.

viriketo 2011-08-30 08:00 merge_renames
Commit 281e5121e7e91bf3e99427cf38d46272b31e5e01
Parent b78d999988489da…
1 file changed +14
~ test/merge_renames.test
M test/merge_renames.test
+14
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -128,5 +128,19 @@
128128
 # Test 3 #
129129
 # Reported: Ticket [30b28cf351] #
130130
 ######################################
131131
132132
 # TO BE WRITTEN.
133
+
134
+######################################
135
+# Test 4 #
136
+# Reported: Ticket [67176c3aa4] #
137
+######################################
138
+
139
+# TO BE WRITTEN.
140
+
141
+
142
+# Tests for troubles not specifically linked with renames but that I'd like to
143
+# write:
144
+# [c26c63eb1b] - 'merge --backout' does not handle conflicts properly
145
+# [953031915f] - Lack of warning when overwriting extra files
146
+# [4df5f38f1e] - Troubles merging a file delete with a file change
133147
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -128,5 +128,19 @@
128 # Test 3 #
129 # Reported: Ticket [30b28cf351] #
130 ######################################
131
132 # TO BE WRITTEN.
 
 
 
 
 
 
 
 
 
 
 
 
 
 
133
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -128,5 +128,19 @@
128 # Test 3 #
129 # Reported: Ticket [30b28cf351] #
130 ######################################
131
132 # TO BE WRITTEN.
133
134 ######################################
135 # Test 4 #
136 # Reported: Ticket [67176c3aa4] #
137 ######################################
138
139 # TO BE WRITTEN.
140
141
142 # Tests for troubles not specifically linked with renames but that I'd like to
143 # write:
144 # [c26c63eb1b] - 'merge --backout' does not handle conflicts properly
145 # [953031915f] - Lack of warning when overwriting extra files
146 # [4df5f38f1e] - Troubles merging a file delete with a file change
147

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button