Message8175
Hi Ralf:
In message <20241111135208.35dkrpr4eo3qkfcv@runtux.com>,
Ralf Schlatterbeck writes:
>I've updated the docs on the new filter function in doc/reference.txt
That looks reasonable.
>and I've implemented the manufacturing of a check function when only a
>filter function is specified for a Permission object. This also has a
>test. Thanks for that idea!
Sure.
>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.
>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.
When looking at your code, I have been merging the default branch and
then diffing against the default branch.
hg up permission-performance
hg merge -r default
hg diff -r default <-- only shows differences
added in permission-performance branch
If I need to merge more changes from permission-performance, I do an:
hg merge --abort
hg up
hg merge -r default
to get back to baseline.
With the permission-performance branch checked out, running 'hg merge
-r default' and 'hg commit' will commit the default branch changes to
you performance branch.
Then:
hg up default
hg merge -r permission-performance
hg commit
should merge the performance branch into the default branch.
After this, 'hg log -G' should look something like:
@ changeset: 8157:da712d7823f8
|\ tag: tip
| | parent: 8153:18a391e63202
| | parent: 8156:0835d0ce2555
| | user: John Rouillard <rouilj@>
| | date: Mon Nov 11 10:27:06 2024 -0500
| | description: to defaut
| |
| o changeset: 8156:0835d0ce2555
|/| branch: permission-performance
| | parent: 8155:e9af08743759
| | parent: 8153:18a391e63202
| | user: John Rouillard <rouilj@>
| | date: Mon Nov 11 10:26:10 2024 -0500
| | files: doc/reference.txt
| | description: test commit
| |
| o changeset: 8155:e9af08743759
| | branch: permission-performance
| | user: Ralf Schlatterbeck <rsc@>
| | date: Mon Nov 11 14:32:25 2024 +0100
| | files: roundup/security.py test/db_test_base.py
| | description: Add check_factory
(I edited so only first line is shown for descriptions, email
addresses de-domained)
8155 is your last commit on the branch. 8156 is the merge from the
default branch to the permission-performance branch. 8157 is the merge
and close of the permission performance branch back to main. If I 'hg
diff -c 8157' I only see the changes from the permission-performance
branch.
From my bookmarks, rebase is answered by:
https://stackoverflow.com/questions/2672351/hg-how-to-do-a-rebase-like-gits-rebase |
|
Date |
User |
Action |
Args |
2024-11-11 16:18:38 | rouilj | set | recipients:
+ rouilj, schlatterbeck |
2024-11-11 16:18:38 | rouilj | link | issue2551330 messages |
2024-11-11 16:18:38 | rouilj | create | |
|