Skip to content

Commit dc2d657

Browse files
committed
Add scenario for re-written history on remote
1 parent 4c03b8d commit dc2d657

File tree

1 file changed

+107
-1
lines changed

1 file changed

+107
-1
lines changed

js/demos.js

Lines changed: 107 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,112 @@ define([], function () {
6969
]
7070
}
7171

72+
var rewrittenHistory = {
73+
title: 'Rewritten Remote History',
74+
key: 'rewritten-history',
75+
message: 'Someone force-pushed and re-wrote history on the remote!',
76+
currentBranch: "feature",
77+
commitData: [
78+
{
79+
"id": "e137e9b",
80+
"tags": [],
81+
"message": "first commit",
82+
"parent": "initial",
83+
"cx": 50,
84+
"cy": 330,
85+
"branchless": false
86+
},
87+
{
88+
"id": "84c98fe",
89+
"parent": "e137e9b",
90+
"tags": [
91+
"master",
92+
"origin/master"
93+
],
94+
"cx": 140,
95+
"cy": 330,
96+
"branchless": false
97+
},
98+
{
99+
"id": "1c016b6",
100+
"parent": "e137e9b",
101+
"tags": [],
102+
"cx": 140,
103+
"cy": 240,
104+
"branchless": false
105+
},
106+
{
107+
"id": "fd0af32",
108+
"parent": "1c016b6",
109+
"tags": [],
110+
"cx": 230,
111+
"cy": 240,
112+
"branchless": false
113+
},
114+
{
115+
"id": "5041e4c",
116+
"tags": [
117+
"feature",
118+
"origin/feature",
119+
"HEAD"
120+
],
121+
"parent": "fd0af32",
122+
"cx": 320,
123+
"cy": 240,
124+
"branchless": false
125+
}
126+
],
127+
originData: [
128+
{
129+
"id": "e137e9b",
130+
"tags": [],
131+
"message": "first commit",
132+
"parent": "initial",
133+
"cx": 50,
134+
"cy": 360,
135+
"branchless": false
136+
},
137+
{
138+
"id": "84c98fe",
139+
"parent": "e137e9b",
140+
"tags": [
141+
"master"
142+
],
143+
"cx": 140,
144+
"cy": 360,
145+
"branchless": false
146+
},
147+
{
148+
"id": "1c016b6",
149+
"parent": "e137e9b",
150+
"tags": [],
151+
"cx": 140,
152+
"cy": 270,
153+
"branchless": false
154+
},
155+
{
156+
"id": "fd0af32",
157+
"tags": [
158+
"feature",
159+
"HEAD"
160+
],
161+
"parent": "1c016b6",
162+
"cx": 230,
163+
"cy": 270,
164+
"branchless": false
165+
},
166+
{
167+
"id": "5041e4c",
168+
"tags": [],
169+
"parent": "fd0af32",
170+
"cx": 320,
171+
"cy": 270,
172+
"branchless": true
173+
}
174+
]
175+
176+
}
177+
72178
var cherryPick = {
73179
title: 'Cherry Picking',
74180
key: 'cherry',
@@ -145,6 +251,6 @@ define([], function () {
145251
}
146252

147253
return [
148-
free, freeWithRemote, upstreamChanges, cherryPick
254+
free, freeWithRemote, upstreamChanges, rewrittenHistory, cherryPick
149255
]
150256
})

0 commit comments

Comments
 (0)