Update the case table in t/t1000.
It still talked about "the proposed alternative semantics" but we have used those alternative semantics for quite some time. Update them to avoid confusion. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Sep 28, 2005 at 12:56 UTC
3e03aaf523331d4f3e92e680f75e6053d1813b64
1 file changed
+12
-31
t/t1000-read-tree-m-3way.sh
+12
-31
@@ -158,49 +158,33 @@ test_expect_success \
158
159
We have so far tested only empty index and clean-and-matching-A index
160
case which are trivial. Make sure index requirements are also
161
-checked. The table also lists alternative semantics which is not
162
-currently implemented.
161
+checked.
162
164
-"git-diff-tree -m O A B"
163
+"git-read-tree -m O A B"
164
165
O A B result index requirements
166
-------------------------------------------------------------------
167
1 missing missing missing - must not exist.
168
------------------------------------------------------------------
170
- 2 missing missing exists no merge must not exist.
171
- ------------------------------------
172
- (ALT) take B* must match B, if exists.
169
+ 2 missing missing exists take B* must match B, if exists.
170
------------------------------------------------------------------
174
- 3 missing exists missing no merge must match A and be
175
- up-to-date, if exists.
176
- ------------------------------------
177
- (ALT) take A* must match A, if exists.
171
+ 3 missing exists missing take A* must match A, if exists.
172
------------------------------------------------------------------
173
4 missing exists A!=B no merge must match A and be
174
up-to-date, if exists.
175
------------------------------------------------------------------
182
- 5 missing exists A==B no merge must match A and be
183
- up-to-date, if exists.
184
- ------------------------------------
185
- (ALT) take A must match A, if exists.
176
+ 5 missing exists A==B take A must match A, if exists.
177
------------------------------------------------------------------
187
- 6 exists missing missing no merge must not exist.
188
- ------------------------------------
189
- (ALT) remove must not exist.
178
+ 6 exists missing missing remove must not exist.
179
------------------------------------------------------------------
180
7 exists missing O!=B no merge must not exist.
181
------------------------------------------------------------------
193
- 8 exists missing O==B no merge must not exist.
194
- ------------------------------------
195
- (ALT) remove must not exist.
182
+ 8 exists missing O==B remove must not exist.
183
------------------------------------------------------------------
184
9 exists O!=A missing no merge must match A and be
185
up-to-date, if exists.
186
------------------------------------------------------------------
200
- 10 exists O==A missing no merge must match A and be
201
- up-to-date, if exists.
202
- ------------------------------------
203
- (ALT) remove ditto
187
+ 10 exists O==A missing remove ditto
188
------------------------------------------------------------------
189
11 exists O!=A O!=B no merge must match A and be
190
A!=B up-to-date, if exists.
@@ -210,10 +194,7 @@ currently implemented.
194
------------------------------------------------------------------
195
13 exists O!=A O==B take A must match A, if exists.
196
------------------------------------------------------------------
213
- 14 exists O==A O!=B take B must match A and be
214
- be up-to-date, if exists.
215
- ------------------------------------
216
- (ALT) take B if exists, must either (1)
197
+ 14 exists O==A O!=B take B if exists, must either (1)
198
match A and be up-to-date,
199
or (2) match B.
200
------------------------------------------------------------------
@@ -223,9 +204,9 @@ currently implemented.
204
*multi* in one in another
205
-------------------------------------------------------------------
206
226
-Note: if we want to implement 2ALT and 3ALT we need to be careful.
227
-The tree A may contain DF (file) when tree B require DF to be a
228
-directory by having DF/DF (file).
207
+Note: we need to be careful in case 2 and 3. The tree A may contain
208
+DF (file) when tree B require DF to be a directory by having DF/DF
209
+(file).
210
211
END_OF_CASE_TABLE
212