Task #11115 (closed)
Internal: Document unrebased PR handling
Reported by: | mtbcarroll | Owned by: | mtbcarroll |
---|---|---|---|
Priority: | minor | Milestone: | Unscheduled |
Component: | Documentation | Version: | n.a. |
Keywords: | internal | Cc: | hflynn, jamoore |
Resources: | n.a. | Referenced By: | n.a. |
References: | n.a. | Remaining Time: | n.a. |
Sprint: | n.a. |
Description
mtbcarroll:
18:50 is there a way I can do the thing that makes the unrebased PRs know that certain ones don't need rebasing so it doesn't list them?
18:50 or am I insufficiently powerful?
Melissa:
18:53 when you edit the *prs.txt files from 'scc unrebased-prs dev_4_4 develop --write', > it should be enough to put "n/a" (without quotes) on the corresponding line instead of the rebased PR
I should check this out and, if it works, document this process in OME internal documents for those preparing standups.
Change History (6)
comment:1 Changed 11 years ago by jamoore
comment:2 Changed 11 years ago by mtbcarroll
So, PR 1010 (8cb50f) is rebased to PR 1013 (bcbf17). I can do,
git notes --ref=see_also/dev_4_4 append -m 'See gh-1010 on dev_4_4 (8cb50f)' bcbf17 git notes --ref=see_also/develop append -m 'See gh-1013 on develop (bcbf17)' 8cb50f git push mtbc refs/notes/see_also/dev_4_4 git push mtbc refs/notes/see_also/develop
or something like that, but I don't see that I can usefully get the notes into the main repository via a pull request or anything.
So, perhaps mailing Josh, as suggested above, and having him deal with it is as good as it gets.
comment:3 Changed 11 years ago by mtbcarroll
- Status changed from new to accepted
comment:4 Changed 11 years ago by mtbcarroll
Josh, what would you want done in vim? Include only the lines that should not be listed, each with a new line for git notes about why?
comment:5 Changed 11 years ago by mtbcarroll
- Resolution set to fixed
- Status changed from accepted to closed
comment:6 Changed 11 years ago by mtbcarroll
- Keywords internal added
- Summary changed from Document unrebased PR handling to Internal: Document unrebased PR handling
The scc commands are primarily documented in the scc command themselves. Feel free to also update those.
Preparing 2 files via --write && vim -O *prs.txt and sending them too me via mail, etc. is a fairly good workflow.