master/upstream out of sync regarding .editorconfig file?

[birkenfeld]

Hi,

I'm getting the following error on build:

dpkg-source: info: local changes detected, the modified files are:
 epics-base-7.0.8.1/.editorconfig

It seems that this file is present on master but not upstream which dpkg complains about since it's not mentioned in any debian patches.

[daykin]

Hi @birkenfeld,

I've updated the upstream/* tags to the correct versions, specifically 7.0.8.1. Please have another go and see if it works for you.

[birkenfeld]

Thank you! With the gbp command line we used to use (gbp buildpackage --git-pristine-tar --git-export-dir=$PWD/../out --git-no-sign-tags --no-sign) I still got a complaint:

1.991 gbp:warning: Pristine-tar branch "pristine-tar" not found
1.993 gbp:info: Creating /dpack/out/epics-base_7.0.8.1.orig.tar.gz
2.071 gbp:error: Error creating epics-base_7.0.8.1.orig.tar.gz: Pristine-tar couldn't checkout "epics-base_7.0.8.1.orig.tar.gz": fatal: ambiguous argument 'bb7632dedb28054f825b63b012bc4c0fac70cd72^{tree}': unknown revision or path not in the working tree.
2.071 Use '--' to separate paths from revisions, like this:
2.071 'git <command> [<revision>...] -- [<file>...]'
2.071 fatal: not a valid object name: bb7632dedb28054f825b63b012bc4c0fac70cd72^{tree}
2.071 tar: This does not look like a tar archive
2.071 tar: Exiting with failure status due to previous errors
2.071 pristine-tar: command failed: git archive --format=tar bb7632dedb28054f825b63b012bc4c0fac70cd72\^\{tree\} | (cd '/tmp/pristine-tar.eELRhFOPEM' && tar x)

However, with --git-no-pristine-tar, I get packages built, which I assume is okay 😄

[daykin]

I probably messed up the pristine-tar tags in a similar way, I'll check it out and let you know when it's fixed. Til then, there shouldn't be any problem with using no-pristine-tar and generating the .orig.tar.gz from upstream/7.0.8.1.

[daykin]

OK, give it another try. I rewrote history on the pristine-tar branch to clean up the junk commits, so you may need to do a fetch-hard reset instead of pulling.