On Mon, Nov 11, 2024 at 04:18:38PM +0000, John Rouillard wrote:
> >Let me know if you think we can merge this.
> 
> If you are claiming this is complete, let me try running with it on
> one of my trackers and set up a check and filter.

Fine!
Let me know what you find.

> >Do you know how to rebase the feature branch to 'default' before
> >merging? I'm familiar with git but never caught on with mercurial...
> 
> You can rebase with a mercurial extension, but normal workflows are to
> do a merge.

Yes, but I prefer seeing what the real changes were when merging a
feature branch, not artefacts from merging. Same for merging in the
changes in the default branch to the feature branch: In that case
we have commits on the feature branch that dilute what really 
happened.

> When looking at your code, I have been merging the default branch and
> then diffing against the default branch.

That would be just a hg diff if properly rebased before merging.

> >From my bookmarks, rebase is answered by:
> 
>   https://stackoverflow.com/questions/2672351/hg-how-to-do-a-rebase-like-gits-rebase

I'll try that when you've looked through the changes.

Thanks!
Ralf
-- 
Dr. Ralf Schlatterbeck                  Tel:   +43/2243/26465-16
Open Source Consulting                  www:   www.runtux.com
Reichergasse 131, A-3411 Weidling       email: office@runtux.com