wording of "files in version control do not match the sdist" message

[cjerdonek]

Hi, I think the following error message can be improved, "files in version control do not match the sdist!"

This error makes it look like check-manifest will be listing what files in version control are different from their versions in the sdist (e.g. if the files have uncommitted changes when running check-manifest). But what it is really saying is that the list of files in version control does not match the list in sdist (i.e. the file names don't match, and not necessarily the contents).

[mgedmin]

Can you suggest a better phrasing?

Would "list of files in version control does not match the sdist" work?

[cjerdonek]

How about "names of files in version control and sdist differ" or "paths of files in version control and sdist differ"?

[cjerdonek]

Note: I updated my previous comment.

[mgedmin]

Him, your first suggestion makes me think these are the same files (I.e. same content) that have differing names. And your second suggestion looks like the same files got moved into a different subdirectory.

[cjerdonek]

Yes, I see what you're saying. How about, "list of files in version control and sdist differ"?

I think that's a little clearer than saying the list doesn't match the sdist (because it is really the sdist's list).

[cjerdonek]

Or "list of files in version control and sdist do not match."

[mgedmin]

I like that.

My English fails me: is it supposed to be "list of files in X and Y do not match" or "lists of files in X and Y do not match"?

[cjerdonek]

The latter is the correct one (because it reduces to "lists do not match"), even though it doesn't sound as good. :)