Re: [Xen-devel] [PATCH] Add TRACKING.IMPORTS to xen.git to more easily manage imported files that need to be kept in sync with an upstream

[Lars Kurth <lars.kurth@xxxxxxxxxx>]

On 16/05/2019, 04:47, "Jan Beulich" <JBeulich@xxxxxxxx> wrote:

    >>> On 16.05.19 at 00:18, <lars.kurth@xxxxxxxxxx> wrote:
    > +# Mappings to track files are of the following format
    > +# ---------------------------------------------------
    > +# manual|auto xen-file name-of-original-repo original-file commit-id
    > +#
    > +# auto:
    > +#   The xen-file needs to track the the original-file exactly
    > +#   In other words, we can automatically update the file using a script
    
    Do we have _any_ example of this? I can't even imagine one, due
    to e.g. our includes all starting with xen/ whereas Linux'es (just to
    take as example) all start with linux/. Perhaps "auto" needs to
    include sed expressions that need to be applied before actually
    applying the original change to our tree?

I am not sure I fully understand your concern. 
This was intended for the case where say we would exactly track xen/.../foo.bar 
with linux/.../foo.bar
In other words, auto only applies to the content of a file: the filename isn't 
relevant, because all the information that would be needed to do this is in the 
file.

But if there is no need for it, we can drop it. And if needed, we can add in 
future.
@Julien, @Stefano, @Jan: are any of the files you listed fall into the "should 
be tracked exactly" category?
    
    > +# manual:
    > +#   A developer needs to make a decision whether a
    > +#   specific change is applied or ignored and update the last commit id
    > +#   accordingly
    > +#
    > +# name-of-original-repo:
    > +#   A reference to a source repository defined by *repo* keyword
    > +#
    > +# commit id:
    > +#   Last commit id of source file that was deemed to be ok
    > +#   and either imported into the tree or rejected
    > +#
    > +# For example:
    > +#   manual xen/drivers/passthrough/arm/smmu.c linux-torvalds 
linux/drivers/iommu/arm-smmu.c b77cf11f094136
    > +
    > +version 1
    
    Perhaps it wouldn't hurt to include the colons in the actual entries as
    well? 

I am not sure what you mean, which colons? Are you saying, the format should be
version: 1
repo: ...

I think the confusion comes because I used colons after statements in the 
comments. 
I think that "version: 1" is slightly more human-readable, so I would be OK 
with that

    I also don't think examples are needed once we get the first
    real entries. Hence I'd move them to the commit message or a
    post-commit message remark.

Agreed.

Lars


    
    

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel