diff --git a/swh/provenance/tests/data/generate_repo.py b/swh/provenance/tests/data/generate_repo.py --- a/swh/provenance/tests/data/generate_repo.py +++ b/swh/provenance/tests/data/generate_repo.py @@ -66,7 +66,7 @@ # move at the proper (first) parent position, if any check_call(["git", "checkout", parents[0]], stdout=PIPE) - # give a branch name (the msg) to each commit to make it esier to + # give a branch name (the msg) to each commit to make it easier to # navigate in history check_call(["git", "checkout", "-b", rev_d["msg"]], stdout=PIPE) diff --git a/swh/provenance/tests/data/history_graphs_with-merges_visits-01.yaml b/swh/provenance/tests/data/history_graphs_with-merges_visits-01.yaml --- a/swh/provenance/tests/data/history_graphs_with-merges_visits-01.yaml +++ b/swh/provenance/tests/data/history_graphs_with-merges_visits-01.yaml @@ -1,12 +1,12 @@ # History graph for snapshot with branches: R01 -- origin: "https://with-merges" +- origin: "https://repo_with_merges/1/" snapshot: "e2520f0dbf34c92754f00c5a60241dfa7d612868" graphs: - rev: "1444db96cbd8cd791abe83527becee73d3c64e86" parents: - rev: "c0d8929936631ecbcf9147be6b8aa13b13b014e4" # History graph for snapshot with branches: R03 and R06 -- origin: "https://with-merges" +- origin: "https://repo_with_merges/1/" snapshot: "e2520f0dbf34c92754f00c5a60241dfa7d612868" graphs: - rev: "20f4da0f48609d9f7f908ebbcac3b3741a0f25cb" @@ -20,7 +20,7 @@ - rev: "1444db96cbd8cd791abe83527becee73d3c64e86" visited: True # History graph for snapshot with branches: R05 and R06 -- origin: "https://with-merges" +- origin: "https://repo_with_merges/2/" snapshot: "e2520f0dbf34c92754f00c5a60241dfa7d612868" graphs: - rev: "65e58853df939b318c106c4c1f55acaf8b41c74c" @@ -32,7 +32,7 @@ - rev: "72d92d41a9095db2dd6b8fb1c62d92c8251753ff" visited: True # History graph for snapshot with branches: R06 and R07 -- origin: "https://with-merges" +- origin: "https://repo_with_merges/1/" snapshot: "e2520f0dbf34c92754f00c5a60241dfa7d612868" graphs: - rev: "72d92d41a9095db2dd6b8fb1c62d92c8251753ff" @@ -42,7 +42,7 @@ - rev: "20f4da0f48609d9f7f908ebbcac3b3741a0f25cb" visited: True # History graph for snapshot with branches: R08 -- origin: "https://with-merges" +- origin: "https://repo_with_merges/1/" snapshot: "e2520f0dbf34c92754f00c5a60241dfa7d612868" graphs: - rev: "7c8f29237dded4f9d265e46ec7066503e7858e87" @@ -53,3 +53,9 @@ visited: True - rev: "fff0089fad98e8f5b46ec5c9025a20a602851ba6" visited: True +# History graph for snapshot with branches: R08 +- origin: "https://repo_with_merges/2/" + snapshot: "e2520f0dbf34c92754f00c5a60241dfa7d612868" + graphs: + - rev: "7c8f29237dded4f9d265e46ec7066503e7858e87" + visited: True