infra/services/gnumbd/test/gnumbd_test.expected/manual_merge_commits_ok.yaml - Issue 424423004: Push pending tag and synthesized commit in a single git push operation.

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_test.expected/manual_merge_commits_ok.yaml

Issue 424423004: Push pending tag and synthesized commit in a single git push operation. (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@master

Patch Set: Created 6 years, 4 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

« no previous file with comments | « infra/services/gnumbd/test/gnumbd_test.expected/incoming_svn_id_drops.yaml ('k') | infra/services/gnumbd/test/gnumbd_test.expected/multi_pending.yaml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 - - The setup.	1 - - The setup.

2 - origin:	2 - origin:

3 refs/heads/master:	3 refs/heads/master:

4 6a6a537d5a9e56978c2cca0dcd550383e563e615:	4 6a6a537d5a9e56978c2cca0dcd550383e563e615:

5 - Two for one!	5 - Two for one!

6 - ''	6 - ''

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

8 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:	8 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

9 - Incoming merge!	9 - Incoming merge!

10 - ''	10 - ''

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
42 - Incoming merge!	42 - Incoming merge!

43 - ''	43 - ''

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

45 f493b56e446fb46797fa09bbf5888790acb039f2:	45 f493b56e446fb46797fa09bbf5888790acb039f2:

46 - Base commit	46 - Base commit

47 - ''	47 - ''

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

49 - log output:	49 - log output:

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

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

52 for ''05726084aa3e3caa3127e29b323a14c7b81a5367'''	52 for ''05726084aa3e3caa3127e29b323a14c7b81a5367'' and pending_tag Ref(TestRep o(''local''),

	53 ''refs/pending-tags/heads/master'')'

53 - - Hello world landed w/o a hitch	54 - - Hello world landed w/o a hitch

54 - origin:	55 - origin:

55 refs/heads/master:	56 refs/heads/master:

56 174544952b2988883002f0d6d28bf31c76f3a6de:	57 174544952b2988883002f0d6d28bf31c76f3a6de:

57 - Hello world	58 - Hello world

58 - ''	59 - ''

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

60 6a6a537d5a9e56978c2cca0dcd550383e563e615:	61 6a6a537d5a9e56978c2cca0dcd550383e563e615:

61 - Two for one!	62 - Two for one!

62 - ''	63 - ''

(...skipping 34 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
97 - ''	98 - ''

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

99 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:	100 497a51ee3c7cc6826aeca9070a4be56011f8e5f6:

100 - Incoming merge!	101 - Incoming merge!

101 - ''	102 - ''

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

103 f493b56e446fb46797fa09bbf5888790acb039f2:	104 f493b56e446fb46797fa09bbf5888790acb039f2:

104 - Base commit	105 - Base commit

105 - ''	106 - ''

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

OLD	NEW