Amar Takhar commented on a discussion: https://gitlab.rtems.org/rtems/rtos/rtems/-/issues/5294#note_126173 I've wanted to move to a vendor-style branch system that FreeBSD uses since it's very suitable for our use: * https://gitlab.com/FreeBSD/freebsd-src/-/tree/main/contrib If you click on one of those direcotories you'll see what they do: * https://gitlab.com/FreeBSD/freebsd-src/-/tags?sort=updated_desc&search=vendor They control the versions using tags see: * https://gitlab.com/FreeBSD/freebsd-src/-/tags?sort=updated_desc&search=one-true-awk So, what the workflow is: 1. Import code to contrib/one-true-awk 2. Tag as `vendor/**` 3. Update with FreeBSD-local changes This lets you: 1. Keep track of local changes and which to upstream which would come in on the next update 2. Let you diff between each revision to see changes between upstream (tag-to-tag) or your local changes 3. Keep a precise linear history of how the code has been managed The added benefit is they all sit under `contrib/` Our problem is we have a complicates source layout It probably makes the most sense to have `contrib/bsp` -- View it on GitLab: https://gitlab.rtems.org/rtems/rtos/rtems/-/issues/5294#note_126173 You're receiving this email because of your account on gitlab.rtems.org.
_______________________________________________ bugs mailing list bugs@rtems.org http://lists.rtems.org/mailman/listinfo/bugs
