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

Side by Side Diff: infra/services/gnumbd/test/gnumbd_smoketests.expected/manual_merge_commits_ok.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/incoming_svn_id_drops.yaml ('k') | infra/services/gnumbd/test/gnumbd_smoketests.expected/master_ahead.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 6a6a537d5a9e56978c2cca0dcd550383e563e615:

5 - Two for one!

6 - ''

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

8 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

9 - Incoming merge!

10 - ''

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

12 f493b56e446fb46797fa09bbf5888790acb039f2:

13 - Base commit

14 - ''

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

16 refs/heads/other:

17 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

18 - Incoming merge!

19 - ''

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

21 refs/pending-tags/heads/master:

22 6a6a537d5a9e56978c2cca0dcd550383e563e615:

23 - Two for one!

24 - ''

25 - 'Cr-Commit-Position: refs/heads/master@{#101}'

26 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

27 - Incoming merge!

28 - ''

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

30 f493b56e446fb46797fa09bbf5888790acb039f2:

31 - Base commit

32 - ''

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

34 refs/pending/heads/master:

35 05726084aa3e3caa3127e29b323a14c7b81a5367:

36 - Hello world

37 6a6a537d5a9e56978c2cca0dcd550383e563e615:

38 - Two for one!

39 - ''

40 - 'Cr-Commit-Position: refs/heads/master@{#101}'

41 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

42 - Incoming merge!

43 - ''

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

45 f493b56e446fb46797fa09bbf5888790acb039f2:

46 - Base commit

47 - ''

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

49 - log output:

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

51 - 'INFO: Pushing synthesized commit ''174544952b2988883002f0d6d28bf31c76f3a6de ''

52 for ''05726084aa3e3caa3127e29b323a14c7b81a5367'''

53 - - Hello world landed w/o a hitch

54 - origin:

55 refs/heads/master:

56 174544952b2988883002f0d6d28bf31c76f3a6de:

57 - Hello world

58 - ''

59 - 'Cr-Commit-Position: refs/heads/master@{#102}'

60 6a6a537d5a9e56978c2cca0dcd550383e563e615:

61 - Two for one!

62 - ''

63 - 'Cr-Commit-Position: refs/heads/master@{#101}'

64 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

65 - Incoming merge!

66 - ''

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

68 f493b56e446fb46797fa09bbf5888790acb039f2:

69 - Base commit

70 - ''

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

72 refs/heads/other:

73 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

74 - Incoming merge!

75 - ''

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

77 refs/pending-tags/heads/master:

78 05726084aa3e3caa3127e29b323a14c7b81a5367:

79 - Hello world

80 6a6a537d5a9e56978c2cca0dcd550383e563e615:

81 - Two for one!

82 - ''

83 - 'Cr-Commit-Position: refs/heads/master@{#101}'

84 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

85 - Incoming merge!

86 - ''

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

88 f493b56e446fb46797fa09bbf5888790acb039f2:

89 - Base commit

90 - ''

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

92 refs/pending/heads/master:

93 05726084aa3e3caa3127e29b323a14c7b81a5367:

94 - Hello world

95 6a6a537d5a9e56978c2cca0dcd550383e563e615:

96 - Two for one!

97 - ''

98 - 'Cr-Commit-Position: refs/heads/master@{#101}'

99 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

100 - Incoming merge!

101 - ''

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

103 f493b56e446fb46797fa09bbf5888790acb039f2:

104 - Base commit

105 - ''

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

OLD	NEW