... | @@ -1423,6 +1423,54 @@ branch based on top of the tag. Those branches get merged in our |
... | @@ -1423,6 +1423,54 @@ branch based on top of the tag. Those branches get merged in our |
|
upstream release is done, a new feature branch is created by merging
|
|
upstream release is done, a new feature branch is created by merging
|
|
the previous feature branch and the new release.
|
|
the previous feature branch and the new release.
|
|
|
|
|
|
|
|
See page 24 and page 25 of the [talk slides](https://static.sched.com/hosted_files/osselc21/f1/OSS%202021%20-%20Icebreaker.pdf) for a view of what
|
|
|
|
that graph looks like. This is what it looks like in `userdir-ldap`:
|
|
|
|
|
|
|
|
```
|
|
|
|
$ git log --decorate --oneline --graph --all
|
|
|
|
* 97c5660 (master) Merge branch 'tpo-scrub-0.3.104-pre'
|
|
|
|
|\
|
|
|
|
| * 698da3a (tpo-scrub-0.3.104-pre-dd7f9a3) update changelog after rebase
|
|
|
|
| * b05f7d0 Set emailappend to torproject.org
|
|
|
|
| * 407775c Use https:// in welcome email
|
|
|
|
| * fecc816 Re-apply tpo changes to Debians repo
|
|
|
|
| * dd7f9a3 (dsa/master) ud-mailgate: fix SPF verification logic to work correctly with "~all"
|
|
|
|
| * f991671 Actually ship ud-guest-extend
|
|
|
|
```
|
|
|
|
|
|
|
|
In this case, there is only one feature branch left, and it's now
|
|
|
|
identical to `master`.
|
|
|
|
|
|
|
|
This is what it looks like in `userdir-ldap-cgi`:
|
|
|
|
|
|
|
|
```
|
|
|
|
* 25cf477 (master) Merge branch 'tpo-scrub-0.3.43-pre-5091066'
|
|
|
|
|\
|
|
|
|
| * 0982aa0 (tpo-scrub-0.3.43-pre-5091066) remove debian-specific stylesheets, use TPO
|
|
|
|
| * 5eb5da8 remove email features not enabled on torproject.org
|
|
|
|
| * 54c03de remove direct access note, disabled in our install
|
|
|
|
| * fec1282 Removed lines which mention finger (TPO has no finger services)
|
|
|
|
| * 18f3aeb drop many fields from update form
|
|
|
|
| * d1dd377 Replace "debian" with "torproject" as much as possible
|
|
|
|
| * 7dcc1a1 (clean-series-0.3.43-pre-5091066) add keywords in changes mail commands help
|
|
|
|
| * aecb3c8 use an absolute path in SSH key upload
|
|
|
|
| * ca110ab remove another needless use of cat
|
|
|
|
| * 685f36b use relative link for web form, drop SSL
|
|
|
|
| * b7bd99d don't document SSH key changes in the password lost page (#33134)
|
|
|
|
| * 05a10e5 explicitely state that we do not support pgp/mime (#33134)
|
|
|
|
| * f98bba6 clarify that show requires a signature as well (#33134)
|
|
|
|
| * e41d911 suggest using --sign for the SSH key as well (#33134)
|
|
|
|
| * 50933fd improve sudo passwords update confirmation string
|
|
|
|
| * 2907fc2 add spacing in doc-mail
|
|
|
|
| * 5091066 (dsa/master) Update now broken links to the naming scheme page to use archive.org
|
|
|
|
| * c08a063 doc-direct: stop referring to access changes from 2003
|
|
|
|
```
|
|
|
|
|
|
|
|
In this particular case the `tpo-scrub` branch is based on top of the
|
|
|
|
`clean-series` patch because there would be too many conflicts
|
|
|
|
otherwise (and we are really, really hoping the patches can be
|
|
|
|
merged). But typically those would both be branched off `dsa/master`.
|
|
|
|
|
|
This pattern is designed so that it's easier to send patches
|
|
This pattern is designed so that it's easier to send patches
|
|
upstream. Unfortunately, upstream releases are somewhat irregular so
|
|
upstream. Unfortunately, upstream releases are somewhat irregular so
|
|
this somewhat breaks down because we don't have a solid branch point
|
|
this somewhat breaks down because we don't have a solid branch point
|
... | | ... | |