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

Side by Side Diff: infra/services/gnumbd/test/gnumbd_test.expected/incoming_svn_id_drops.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/extra_user_footer_bad.yaml ('k') | infra/services/gnumbd/test/gnumbd_test.expected/manual_merge_commits_ok.yaml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 - - Two commits in origin	1 - - Two commits in origin

2 - origin:	2 - origin:

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

4 c13b023249549a53db6b9f098aba2020d9512722:	4 c13b023249549a53db6b9f098aba2020d9512722:

5 - Base commit	5 - Base commit

6 - ''	6 - ''

7 - 'git-svn-id: svn://repo/path@100 0039d316-1c4b-4281-b951-d872f2087c98'	7 - 'git-svn-id: svn://repo/path@100 0039d316-1c4b-4281-b951-d872f2087c98'

8 refs/pending-tags/heads/master:	8 refs/pending-tags/heads/master:

9 c13b023249549a53db6b9f098aba2020d9512722:	9 c13b023249549a53db6b9f098aba2020d9512722:

10 - Base commit	10 - Base commit

11 - ''	11 - ''

12 - 'git-svn-id: svn://repo/path@100 0039d316-1c4b-4281-b951-d872f2087c98'	12 - 'git-svn-id: svn://repo/path@100 0039d316-1c4b-4281-b951-d872f2087c98'

13 refs/pending/heads/master:	13 refs/pending/heads/master:

14 6a542f2860cee60e663990cfdb53d48e13e01c9b:	14 6a542f2860cee60e663990cfdb53d48e13e01c9b:

15 - Hello world	15 - Hello world

16 c13b023249549a53db6b9f098aba2020d9512722:	16 c13b023249549a53db6b9f098aba2020d9512722:

17 - Base commit	17 - Base commit

18 - ''	18 - ''

19 - 'git-svn-id: svn://repo/path@100 0039d316-1c4b-4281-b951-d872f2087c98'	19 - 'git-svn-id: svn://repo/path@100 0039d316-1c4b-4281-b951-d872f2087c98'

20 - log output:	20 - log output:

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

22 - 'INFO: Pushing synthesized commit ''7c07c12e9d3c36dc8b65d0f3a3828f937be2d6ca ''	22 - 'INFO: Pushing synthesized commit ''7c07c12e9d3c36dc8b65d0f3a3828f937be2d6ca ''

23 for ''6a542f2860cee60e663990cfdb53d48e13e01c9b'''	23 for ''6a542f2860cee60e663990cfdb53d48e13e01c9b'' and pending_tag Ref(TestRep o(''local''),

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

24 - - Hello world should be 101	25 - - Hello world should be 101

25 - origin:	26 - origin:

26 refs/heads/master:	27 refs/heads/master:

27 7c07c12e9d3c36dc8b65d0f3a3828f937be2d6ca:	28 7c07c12e9d3c36dc8b65d0f3a3828f937be2d6ca:

28 - Hello world	29 - Hello world

29 - ''	30 - ''

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

31 c13b023249549a53db6b9f098aba2020d9512722:	32 c13b023249549a53db6b9f098aba2020d9512722:

32 - Base commit	33 - Base commit

33 - ''	34 - ''

34 - 'git-svn-id: svn://repo/path@100 0039d316-1c4b-4281-b951-d872f2087c98'	35 - 'git-svn-id: svn://repo/path@100 0039d316-1c4b-4281-b951-d872f2087c98'

35 refs/pending-tags/heads/master:	36 refs/pending-tags/heads/master:

36 6a542f2860cee60e663990cfdb53d48e13e01c9b:	37 6a542f2860cee60e663990cfdb53d48e13e01c9b:

37 - Hello world	38 - Hello world

38 c13b023249549a53db6b9f098aba2020d9512722:	39 c13b023249549a53db6b9f098aba2020d9512722:

39 - Base commit	40 - Base commit

40 - ''	41 - ''

41 - 'git-svn-id: svn://repo/path@100 0039d316-1c4b-4281-b951-d872f2087c98'	42 - 'git-svn-id: svn://repo/path@100 0039d316-1c4b-4281-b951-d872f2087c98'

42 refs/pending/heads/master:	43 refs/pending/heads/master:

43 6a542f2860cee60e663990cfdb53d48e13e01c9b:	44 6a542f2860cee60e663990cfdb53d48e13e01c9b:

44 - Hello world	45 - Hello world

45 c13b023249549a53db6b9f098aba2020d9512722:	46 c13b023249549a53db6b9f098aba2020d9512722:

46 - Base commit	47 - Base commit

47 - ''	48 - ''

48 - 'git-svn-id: svn://repo/path@100 0039d316-1c4b-4281-b951-d872f2087c98'	49 - 'git-svn-id: svn://repo/path@100 0039d316-1c4b-4281-b951-d872f2087c98'

OLD	NEW