Viewing files at commit 2f5107c20e85Commit detailsView latest

Browse files
suites/merge/known_bugs.json 41 lines · 1.5 KB · json
1
{
2
  "note": "Known Oak bugs this suite reproduces. First matching rule wins for an oak-wrong row. When Oak fixes a bug its rows stop being oak-wrong and the summary reports the entry as 'NOT reproduced (fixed?)'; then retire the entry. Filed by QA (not by this suite).",
3
  "bugs": [
4
    {
5
      "id": "fb-540",
6
      "family": "F5",
7
      "severity": "Blocker",
8
      "title": "file<->directory transitions make oak pull (and oak switch) fail; failed pull can move HEAD with a pre-merge worktree",
9
      "reason_prefix": "oak_error",
10
      "scenario_glob": "gix-*"
11
    },
12
    {
13
      "id": "fb-538",
14
      "family": "F2",
15
      "severity": "High",
16
      "title": "symlinks (or symlink-vs-file) changed on both sides are text-merged; target committed with glued conflict markers",
17
      "reason_prefix": "committed_conflict_markers_symlink:"
18
    },
19
    {
20
      "id": "fb-537",
21
      "family": "F1+F3",
22
      "severity": "Blocker",
23
      "title": "conflict markers committed as a clean merge when a side has no trailing newline (text and binary)",
24
      "reason_prefix": "committed_conflict_markers:"
25
    },
26
    {
27
      "id": "fb-539",
28
      "family": "F4",
29
      "severity": "High",
30
      "title": "mode change silently lost (chmod vs content edit, or both sides disagree on mode)",
31
      "reason_prefix": "lost_mode_change"
32
    },
33
    {
34
      "id": "fb-541",
35
      "family": "F6",
36
      "severity": "Medium",
37
      "title": "criss-cross with divergent resolutions merges silently (one best common ancestor picked)",
38
      "scenario_glob": "git-t6416-*"
39
    }
40
  ]
41
}