Should we use branches?

[Fabian Huch]

The danger of such a model is that branches quickly become stale and a 
nightmare to rebase. In my experience this model only really works well 
if developers are well synchronized, so people work on largely distinct 
pieces of code, or everybody integrates their changes with the trunk 
frequently, e.g. once per day.

The former doesn't really apply in this environment. The latter one can 
already do when appropriate, since we have a trunk-based model.

Note that in hg, /branches/ mean divergent lines of work that can't be 
re-based. What you describe here are /topics/ in hg.


Fabian

On 5/16/25 12:34, Lawrence Paulson via isabelle-dev wrote:
> One thing I've noticed at Amazon is that they insist on a single 
> threaded revision trail. They do this by requiring everybody to make 
> their changes within a personal branch, which they then re-base to the 
> main branch before pushing. Sometimes they also merge adjacent 
> commits. In return for mastering a couple of extra commands, everybody 
> benefits from a much cleaner revision history. Do we want to try this?
>
> Larry
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mailman46.in.tum.de/pipermail/isabelle-dev/attachments/20250516/8f8072ac/attachment-0001.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: hg.jpeg
Type: image/jpeg
Size: 99363 bytes
Desc: not available
URL: <https://mailman46.in.tum.de/pipermail/isabelle-dev/attachments/20250516/8f8072ac/attachment-0001.jpeg>