infra/services/gnumbd/test/gnumbd_smoketests.expected/merge_commits_fail.yaml - Issue 355153002: Refactor infra git libs and testing.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: infra/services/gnumbd/test/gnumbd_smoketests.expected/merge_commits_fail.yaml

Issue 355153002: Refactor infra git libs and testing. (Closed) Base URL: https://chromium.googlesource.com/infra/infra@fake_testing_support

Patch Set: Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« infra/libs/git2/util.py ('K') | « infra/services/gnumbd/test/gnumbd_smoketests.expected/master_tag_ahead_pending.yaml ('k') | infra/services/gnumbd/test/gnumbd_smoketests.expected/multi_pending.yaml » ('j') | test.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
	(Empty)
1 - - The setup.

2 - origin:

3 refs/heads/master:

4 f493b56e446fb46797fa09bbf5888790acb039f2:

5 - Base commit

6 - ''

7 - 'Cr-Commit-Position: refs/heads/master@{#100}'

8 refs/heads/other:

9 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

10 - Incoming merge!

11 - ''

12 - 'Cr-Commit-Position: refs/heads/other@{#20}'

13 refs/pending-tags/heads/master:

14 f493b56e446fb46797fa09bbf5888790acb039f2:

15 - Base commit

16 - ''

17 - 'Cr-Commit-Position: refs/heads/master@{#100}'

18 refs/pending/heads/master:

19 aeedb7388bbeb9d10cf8a2f3aceeb32984b07624:

20 - Hello world

21 38b859f0a917740e3f427a6aa7d3322ff3934693:

22 - Two for one!

23 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

24 - Incoming merge!

25 - ''

26 - 'Cr-Commit-Position: refs/heads/other@{#20}'

27 f493b56e446fb46797fa09bbf5888790acb039f2:

28 - Base commit

29 - ''

30 - 'Cr-Commit-Position: refs/heads/master@{#100}'

31 - log output:

32 - 'INFO: Processing Ref(TestRepo(''local''), ''refs/heads/master'')'

33 - 'WARNING: Skipping already-processed commit on real_ref Ref(TestRepo(''local ''),

34 ''refs/heads/master''): ''497a51ee3c7cc6826aeca9070a4be56011f8e5f6'''

35 - 'ERROR: Commit ''38b859f0a917740e3f427a6aa7d3322ff3934693'' has more than on e

36 parent!'

37 - 'ERROR: Cannot process pending merge commit Commit(TestRepo(''local''), ''38 b859f0a917740e3f427a6aa7d3322ff3934693'')'

38 - - Should be the same

39 - origin:

40 refs/heads/master:

41 f493b56e446fb46797fa09bbf5888790acb039f2:

42 - Base commit

43 - ''

44 - 'Cr-Commit-Position: refs/heads/master@{#100}'

45 refs/heads/other:

46 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

47 - Incoming merge!

48 - ''

49 - 'Cr-Commit-Position: refs/heads/other@{#20}'

50 refs/pending-tags/heads/master:

51 f493b56e446fb46797fa09bbf5888790acb039f2:

52 - Base commit

53 - ''

54 - 'Cr-Commit-Position: refs/heads/master@{#100}'

55 refs/pending/heads/master:

56 aeedb7388bbeb9d10cf8a2f3aceeb32984b07624:

57 - Hello world

58 38b859f0a917740e3f427a6aa7d3322ff3934693:

59 - Two for one!

60 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

61 - Incoming merge!

62 - ''

63 - 'Cr-Commit-Position: refs/heads/other@{#20}'

64 f493b56e446fb46797fa09bbf5888790acb039f2:

65 - Base commit

66 - ''

67 - 'Cr-Commit-Position: refs/heads/master@{#100}'

OLD	NEW