David Landgren wrote:
> Nicholas also wanted to know what support git provided to answer
> questions such as "which changes from this branch have been integrated
> into that branch". Rafael seemed to think it should be possible, but
> no people with strong git-fu responded.
Sorry about that. I'm quite backlogged. Detecting cherry-picks is
documented on the git rev-list man page; it's something like this:
git rev-list --left-right --cherry-pick maint-5.10..blead
That would show changes on blead which are not on maint-5.10. If the
change was altered along the way, such as being ignored, it is
considered a new change and will not be omitted by this command.
It's worth noting that Perforce had no concept of cherry-picked changes
either, and instead people wrote the scripts to work with the facilities
it does provide. I made sure during the conversion to copy across the
relevant information into breadcrumbs in the revision history, to allow
those particular tools to be ported.
If you want to do it based on some other token, well git has no built-in
support for that, but I have implemented this before based on a simple
comparison of the subject line, and in practice - assuming all commits
are well titled, and that you merge without squashing commits - this
solves the actual problem well.
> Elsewhere, there was some idle chatter of converting everything to
> UTF-8, but no resolution.
On the perl foundation wiki there is a page on this. Note that this
applies to author names only, not to anything in the content of the
repository. Since that conversation, I have had time to triage and plan
the fixes, and I hope that I will find time to make a new release of the
history with these issues fixed. I will announce when this is the case!
Thanks for your summaries,
Sam.
|
Highlight