68 lines
3.6 KiB
HTML
68 lines
3.6 KiB
HTML
<!DOCTYPE html>
|
|
<html>
|
|
<head>
|
|
<title>ROBOMERGE</title>
|
|
<link rel="icon" href="/img/robo-r.png" type="image/png">
|
|
<link rel="stylesheet" href="/css/fontawesome.5.9.0.all.min.css">
|
|
<link rel="stylesheet" href="/css/bootstrap.min.css">
|
|
<link rel="stylesheet" href="/css/main.css">
|
|
<link rel="stylesheet" href="/css/table.css">
|
|
|
|
<script src="/js/jquery-3.4.1.min.js"></script>
|
|
<script src="/js/bootstrap.bundle.min.js"></script>
|
|
|
|
<script src="/js/boilerplate.js"></script>
|
|
<script src="/js/createshelf.js"></script>
|
|
<script language="javascript">
|
|
|
|
$(function() {
|
|
shelfVerify()
|
|
});
|
|
|
|
</script>
|
|
</head>
|
|
<body>
|
|
|
|
|
|
<div class="text">
|
|
<div id="preview"></div>
|
|
<div id="result"></div>
|
|
<div id="nextSteps" class="initiallyHidden centered-text">
|
|
<h3>What next?</h3>
|
|
<p>Robomerge will run the merge for the changelist again and create any shelved conflicts in the workspace you chose. You should receive a notification when this process is complete.
|
|
<b>This does not skip or unblock robomerge. It is still time sensitive that you resolve the conflict and submit, or skip the conflict.</b></p>
|
|
<p>If you do not receive a notification, please <strong><a href="/contact">Contact Us</a></strong> for Robomerge help.</p>
|
|
</div>
|
|
<div id="createStreamWorkspaceTutorial" class="initiallyHidden centered-text">
|
|
<h2>Sorry, no user workspaces found for stream "<strong class="streamName"></strong>". Robomerge cannot create a shelf for you without one.</h2>
|
|
<h3>How do I create a workspace in stream "<strong class="streamName"></strong>"?</h3>
|
|
<p>If you've never created a workspace in a stream before and need help, please follow these steps:</p>
|
|
<ol>
|
|
<li>Open your Perforce Visual Client (<strong>P4V</strong>). If you do not have Perforce installed, please visit IT's wiki page on setting up Perforce.</li>
|
|
<li>Ensure you are logged into Perforce. If you do not know how to connect to Perforce, IT's wiki page on setting up Perforce has connection information.</li>
|
|
<li>Find <strong class="streamName"></strong> in your depot view.</li>
|
|
<li><a href="https://www.perforce.com/perforce/r17.2/manuals/p4v/streams.graph.html#streams.graph.work">Follow the Perforce documentation to create your workspace in <strong class="streamName"></strong>.</a></li>
|
|
<li>Once you have created the workspace, refresh this page.</li>
|
|
</ol>
|
|
<p>If you still require assistance, please <strong><a href="/contact">Contact Us</a></strong> for Robomerge help.</p>
|
|
|
|
</div>
|
|
<div id="workspaceFormDiv" class='initiallyHidden' align="center">
|
|
<!-- Dynamically generated by Javascript -->
|
|
<div id="inexactWorkspaceWarning" class="initiallyHidden centered-text alert alert-warning fade in show" role="alert">
|
|
<h4>Warning!</h4>
|
|
<p>You've selected a workspace that doesn't exactly match the stream of the merge target. This could still be a valid workspace if you intend to switch the stream of your workspace, or the workspace is mapped to a virtual stream. Use at your own peril.</p>
|
|
</div>
|
|
<div id="acknowledgeCheckboxDiv" align="center" >
|
|
<label><input class="initiallyHidden" type="checkbox" name="acknowledgeCheckbox">Acknowledge conflict on successful shelf creation</label>
|
|
</div>
|
|
<div id="submitDiv" align="center">
|
|
<!-- Dynamically generated by Javascript -->
|
|
</div>
|
|
</div>
|
|
<button id="returnbutton" class="initiallyHidden btn btn-lg btn-block btn-info" onclick="goHome()">Return to RoboMerge homepage</button>
|
|
</div>
|
|
|
|
|
|
</body>
|
|
</html> |