<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en" style='--code-editor-font: var(--default-mono-font, "GitLab Mono"), JetBrains Mono, Menlo, DejaVu Sans Mono, Liberation Mono, Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, monospace;'>
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style data-premailer="ignore" type="text/css">
a { color: #1068bf; }
</style>
<style>img {
max-width: 100%; height: auto;
}
body {
font-size: .875rem;
}
body {
-webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px;
}
body {
font-family: "GitLab Sans",-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; font-size: inherit;
}
</style>
</head>
<body style='font-size: inherit; -webkit-text-shadow: rgba(255,255,255,.01) 0 0 1px; font-family: "GitLab Sans",-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";'>
<div class="content">
<p class="details" style="font-style: italic; color: #737278;">
<a href="https://gitlab.rtems.org/amar">Amar Takhar</a> created an issue: <a href="https://gitlab.rtems.org/administration/gitlab/-/issues/99">#99</a>
</p>
<p>
Assignee: Amar Takhar
</p>
<div class="md" style="position: relative; z-index: 1; color: #28272d; word-wrap: break-word;">
<p dir="auto" style="color: #28272d; margin: 0 0 16px;" align="initial">We discussed during our last meeting 2025-06-05 on how to handle contributed code -- as in code we <em style="margin-top: 0;">upstream</em> to projects. Currently it's a bit of a jumble as we've never had a formal process on how we manage these. It creates a fractured history and we've never had a formal way to discuss before things are sent upstream on behalf of the project.</p>
<p dir="auto" style="color: #28272d; margin: 0 0 16px;" align="initial">The goal is, if it's a patch going upstream on behalf of the project for it to be official we'll need to have an MR that exists locally on our GitLab.</p>
<p dir="auto" style="color: #28272d; margin: 0 0 16px;" align="initial">A few things to note.</p>
<ol dir="auto" style="text-align: initial; margin: 0 0 16px; padding: 0;">
<li style="margin-top: 0; line-height: 1.6em; margin-left: 25px; padding-left: 3px;">These mirrors are <strong style="font-weight: 600; margin-top: 0;">read only</strong> any changes made will be overwritten and most actions will be blocked</li>
<li style="line-height: 1.6em; margin-left: 25px; padding-left: 3px;">In order for RTEMS to consume a change to any of these repositories it <strong style="font-weight: 600; margin-top: 0;">must</strong> be upstreamed</li>
<li style="line-height: 1.6em; margin-left: 25px; padding-left: 3px;">Before submitting a patch we will track using issues in those projects and MRs</li>
</ol>
<p dir="auto" style="color: #28272d; margin: 0 0 16px;" align="initial">The suggested workflow we talked about is:</p>
<ol dir="auto" style="text-align: initial; margin: 0 0 16px; padding: 0;">
<li style="margin-top: 0; line-height: 1.6em; margin-left: 25px; padding-left: 3px;">Open an issue if there is no code available for a suggested change to have a discussion</li>
<li style="line-height: 1.6em; margin-left: 25px; padding-left: 3px;">If there is a change open an MR against the main branch of the contrib repository</li>
<li style="line-height: 1.6em; margin-left: 25px; padding-left: 3px;">Upstream the patch and link the PR/Email/whatever in the MR if possible</li>
<li style="line-height: 1.6em; margin-left: 25px; padding-left: 3px;">Once the change has been merged upstream link to the <strong style="font-weight: 600; margin-top: 0;">local contrib repo</strong> commit hash that contains the change(s) then <strong style="font-weight: 600;">close</strong> the MR. If the has remains the same GitLab will automatically remove the commits from the MR. If the MR is closed and commits still exist this means it was modified upstream which is fine but gives us a good indication.</li>
</ol>
<p dir="auto" style="color: #28272d; margin: 0;" align="initial">Any comments about this can be added below for discussion the contrib repos have been added for forking already.</p>
</div>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #737278;">
—
<br>
<a href="https://gitlab.rtems.org/administration/gitlab/-/issues/99">View it on GitLab</a>.
<br>
You're receiving this email because of your account on <a target="_blank" rel="noopener noreferrer" href="https://gitlab.rtems.org">gitlab.rtems.org</a>. <a href="https://gitlab.rtems.org/-/sent_notifications/0941c802367197463eeac320fd175f21/unsubscribe" target="_blank" rel="noopener noreferrer">Unsubscribe</a> from this thread · <a href="https://gitlab.rtems.org/-/profile/notifications" target="_blank" rel="noopener noreferrer" class="mng-notif-link">Manage all notifications</a> · <a href="https://gitlab.rtems.org/help" target="_blank" rel="noopener noreferrer" class="help-link">Help</a>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Issue","url":"https://gitlab.rtems.org/administration/gitlab/-/issues/99"}}</script>
</p>
</div>
</body>
</html>