Commit 723e1ca
fix: drop malformed watson.searchentry rows left by bad merge
The merge of dev into this branch (2f8f682) collided on the watson
search-entry rows: dev removed stub_finding entries while this branch
removed cred_user entries, and the three-way merge dropped only the
model name from each conflicting row, leaving six entries per fixture
with content_type set to ['dojo'] (a one-element natural key).
loaddata then failed with:
ContentTypeManager.get_by_natural_key() missing 1 required
positional argument: 'model' ... (watson.searchentry:pk=4)
field_value was '['dojo']'
These rows pointed at the now-removed cred_user content type and were
already supposed to be deleted (see 12d749f). Remove them from both
fixture files.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>1 parent 2f8f682 commit 723e1ca
2 files changed
Lines changed: 0 additions & 204 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43163 | 43163 | | |
43164 | 43164 | | |
43165 | 43165 | | |
43166 | | - | |
43167 | | - | |
43168 | | - | |
43169 | | - | |
43170 | | - | |
43171 | | - | |
43172 | | - | |
43173 | | - | |
43174 | | - | |
43175 | | - | |
43176 | | - | |
43177 | | - | |
43178 | | - | |
43179 | | - | |
43180 | | - | |
43181 | | - | |
43182 | | - | |
43183 | | - | |
43184 | | - | |
43185 | | - | |
43186 | | - | |
43187 | | - | |
43188 | | - | |
43189 | | - | |
43190 | | - | |
43191 | | - | |
43192 | | - | |
43193 | | - | |
43194 | | - | |
43195 | | - | |
43196 | | - | |
43197 | | - | |
43198 | | - | |
43199 | | - | |
43200 | | - | |
43201 | | - | |
43202 | | - | |
43203 | | - | |
43204 | | - | |
43205 | | - | |
43206 | | - | |
43207 | | - | |
43208 | | - | |
43209 | | - | |
43210 | | - | |
43211 | | - | |
43212 | | - | |
43213 | | - | |
43214 | | - | |
43215 | | - | |
43216 | | - | |
43217 | 43166 | | |
43218 | 43167 | | |
43219 | 43168 | | |
| |||
43466 | 43415 | | |
43467 | 43416 | | |
43468 | 43417 | | |
43469 | | - | |
43470 | | - | |
43471 | | - | |
43472 | | - | |
43473 | | - | |
43474 | | - | |
43475 | | - | |
43476 | | - | |
43477 | | - | |
43478 | | - | |
43479 | | - | |
43480 | | - | |
43481 | | - | |
43482 | | - | |
43483 | | - | |
43484 | | - | |
43485 | | - | |
43486 | | - | |
43487 | | - | |
43488 | | - | |
43489 | | - | |
43490 | | - | |
43491 | | - | |
43492 | | - | |
43493 | | - | |
43494 | | - | |
43495 | | - | |
43496 | | - | |
43497 | | - | |
43498 | | - | |
43499 | | - | |
43500 | | - | |
43501 | | - | |
43502 | | - | |
43503 | | - | |
43504 | | - | |
43505 | | - | |
43506 | | - | |
43507 | | - | |
43508 | | - | |
43509 | | - | |
43510 | | - | |
43511 | | - | |
43512 | | - | |
43513 | | - | |
43514 | | - | |
43515 | | - | |
43516 | | - | |
43517 | | - | |
43518 | | - | |
43519 | | - | |
43520 | 43418 | | |
43521 | 43419 | | |
43522 | 43420 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
78976 | 78976 | | |
78977 | 78977 | | |
78978 | 78978 | | |
78979 | | - | |
78980 | | - | |
78981 | | - | |
78982 | | - | |
78983 | | - | |
78984 | | - | |
78985 | | - | |
78986 | | - | |
78987 | | - | |
78988 | | - | |
78989 | | - | |
78990 | | - | |
78991 | | - | |
78992 | | - | |
78993 | | - | |
78994 | | - | |
78995 | | - | |
78996 | | - | |
78997 | | - | |
78998 | | - | |
78999 | | - | |
79000 | | - | |
79001 | | - | |
79002 | | - | |
79003 | | - | |
79004 | | - | |
79005 | | - | |
79006 | | - | |
79007 | | - | |
79008 | | - | |
79009 | | - | |
79010 | | - | |
79011 | | - | |
79012 | | - | |
79013 | | - | |
79014 | | - | |
79015 | | - | |
79016 | | - | |
79017 | | - | |
79018 | | - | |
79019 | | - | |
79020 | | - | |
79021 | | - | |
79022 | | - | |
79023 | | - | |
79024 | | - | |
79025 | | - | |
79026 | | - | |
79027 | | - | |
79028 | | - | |
79029 | | - | |
79030 | 78979 | | |
79031 | 78980 | | |
79032 | 78981 | | |
| |||
79279 | 79228 | | |
79280 | 79229 | | |
79281 | 79230 | | |
79282 | | - | |
79283 | | - | |
79284 | | - | |
79285 | | - | |
79286 | | - | |
79287 | | - | |
79288 | | - | |
79289 | | - | |
79290 | | - | |
79291 | | - | |
79292 | | - | |
79293 | | - | |
79294 | | - | |
79295 | | - | |
79296 | | - | |
79297 | | - | |
79298 | | - | |
79299 | | - | |
79300 | | - | |
79301 | | - | |
79302 | | - | |
79303 | | - | |
79304 | | - | |
79305 | | - | |
79306 | | - | |
79307 | | - | |
79308 | | - | |
79309 | | - | |
79310 | | - | |
79311 | | - | |
79312 | | - | |
79313 | | - | |
79314 | | - | |
79315 | | - | |
79316 | | - | |
79317 | | - | |
79318 | | - | |
79319 | | - | |
79320 | | - | |
79321 | | - | |
79322 | | - | |
79323 | | - | |
79324 | | - | |
79325 | | - | |
79326 | | - | |
79327 | | - | |
79328 | | - | |
79329 | | - | |
79330 | | - | |
79331 | | - | |
79332 | | - | |
79333 | 79231 | | |
79334 | 79232 | | |
79335 | 79233 | | |
| |||
0 commit comments