OLD | NEW |
| (Empty) |
1 - - Master is behind, pending is ahead of tag | |
2 - origin: | |
3 refs/heads/master: | |
4 f493b56e446fb46797fa09bbf5888790acb039f2: | |
5 - Base commit | |
6 - '' | |
7 - 'Cr-Commit-Position: refs/heads/master@{#100}' | |
8 refs/pending-tags/heads/master: | |
9 d0168885399a3cfd71ca399347923e166183c704: | |
10 - Hello world | |
11 f493b56e446fb46797fa09bbf5888790acb039f2: | |
12 - Base commit | |
13 - '' | |
14 - 'Cr-Commit-Position: refs/heads/master@{#100}' | |
15 refs/pending/heads/master: | |
16 074071c552b436f9167c3b16b41e1092e90cc297: | |
17 - New pending | |
18 d0168885399a3cfd71ca399347923e166183c704: | |
19 - Hello world | |
20 f493b56e446fb46797fa09bbf5888790acb039f2: | |
21 - Base commit | |
22 - '' | |
23 - 'Cr-Commit-Position: refs/heads/master@{#100}' | |
24 - log output: | |
25 - 'INFO: Processing Ref(TestRepo(''local''), ''refs/heads/master'')' | |
26 - 'WARNING: Skipping already-processed commit on real_ref Ref(TestRepo(''local
''), | |
27 ''refs/heads/master''): ''074071c552b436f9167c3b16b41e1092e90cc297''' | |
28 - 'WARNING: Catching up pending_tag Ref(TestRepo(''local''), ''refs/pending-ta
gs/heads/master'') | |
29 (was 1 behind)' | |
30 - 'ERROR: Content of new tag ''074071c552b436f9167c3b16b41e1092e90cc297'' does
not | |
31 match content of ''f493b56e446fb46797fa09bbf5888790acb039f2''!' | |
32 - - Should see errors and no change | |
33 - origin: | |
34 refs/heads/master: | |
35 f493b56e446fb46797fa09bbf5888790acb039f2: | |
36 - Base commit | |
37 - '' | |
38 - 'Cr-Commit-Position: refs/heads/master@{#100}' | |
39 refs/pending-tags/heads/master: | |
40 d0168885399a3cfd71ca399347923e166183c704: | |
41 - Hello world | |
42 f493b56e446fb46797fa09bbf5888790acb039f2: | |
43 - Base commit | |
44 - '' | |
45 - 'Cr-Commit-Position: refs/heads/master@{#100}' | |
46 refs/pending/heads/master: | |
47 074071c552b436f9167c3b16b41e1092e90cc297: | |
48 - New pending | |
49 d0168885399a3cfd71ca399347923e166183c704: | |
50 - Hello world | |
51 f493b56e446fb46797fa09bbf5888790acb039f2: | |
52 - Base commit | |
53 - '' | |
54 - 'Cr-Commit-Position: refs/heads/master@{#100}' | |
55 - - Fix by rewinding tag | |
56 - origin: | |
57 refs/heads/master: | |
58 f493b56e446fb46797fa09bbf5888790acb039f2: | |
59 - Base commit | |
60 - '' | |
61 - 'Cr-Commit-Position: refs/heads/master@{#100}' | |
62 refs/pending-tags/heads/master: | |
63 f493b56e446fb46797fa09bbf5888790acb039f2: | |
64 - Base commit | |
65 - '' | |
66 - 'Cr-Commit-Position: refs/heads/master@{#100}' | |
67 refs/pending/heads/master: | |
68 074071c552b436f9167c3b16b41e1092e90cc297: | |
69 - New pending | |
70 d0168885399a3cfd71ca399347923e166183c704: | |
71 - Hello world | |
72 f493b56e446fb46797fa09bbf5888790acb039f2: | |
73 - Base commit | |
74 - '' | |
75 - 'Cr-Commit-Position: refs/heads/master@{#100}' | |
76 - log output: | |
77 - 'INFO: Processing Ref(TestRepo(''local''), ''refs/heads/master'')' | |
78 - 'INFO: Pushing synthesized commit ''bcb32c4afe6a1a17e64d6e6a7e69884c1b80a1be
'' | |
79 for ''d0168885399a3cfd71ca399347923e166183c704''' | |
80 - 'INFO: Pushing synthesized commit ''e9c4d2437d60d8f31b2a8e8bc506aa9fe928c740
'' | |
81 for ''074071c552b436f9167c3b16b41e1092e90cc297''' | |
82 - - All better | |
83 - origin: | |
84 refs/heads/master: | |
85 e9c4d2437d60d8f31b2a8e8bc506aa9fe928c740: | |
86 - New pending | |
87 - '' | |
88 - 'Cr-Commit-Position: refs/heads/master@{#102}' | |
89 bcb32c4afe6a1a17e64d6e6a7e69884c1b80a1be: | |
90 - Hello world | |
91 - '' | |
92 - 'Cr-Commit-Position: refs/heads/master@{#101}' | |
93 f493b56e446fb46797fa09bbf5888790acb039f2: | |
94 - Base commit | |
95 - '' | |
96 - 'Cr-Commit-Position: refs/heads/master@{#100}' | |
97 refs/pending-tags/heads/master: | |
98 074071c552b436f9167c3b16b41e1092e90cc297: | |
99 - New pending | |
100 d0168885399a3cfd71ca399347923e166183c704: | |
101 - Hello world | |
102 f493b56e446fb46797fa09bbf5888790acb039f2: | |
103 - Base commit | |
104 - '' | |
105 - 'Cr-Commit-Position: refs/heads/master@{#100}' | |
106 refs/pending/heads/master: | |
107 074071c552b436f9167c3b16b41e1092e90cc297: | |
108 - New pending | |
109 d0168885399a3cfd71ca399347923e166183c704: | |
110 - Hello world | |
111 f493b56e446fb46797fa09bbf5888790acb039f2: | |
112 - Base commit | |
113 - '' | |
114 - 'Cr-Commit-Position: refs/heads/master@{#100}' | |
OLD | NEW |