Thanks Andrius and Julian
Forgot to mention that I had already pushed my changes.
I will try to adapt to the new git standard but that will be my Christmas project.
Julian, your solution with a new tag worked perfectly but I won't push my changes until it is lintian clean.
Regards
Gudjon
On Mon, Dec 5, 2022 at 1:04 PM Julian Gilbey <
julian@d-and-j.net> wrote:
On Mon, Dec 05, 2022 at 06:24:48AM +0000, Guðjón Guðjónsson wrote:
Hi list
I am working on eric and I made a mistake while updating the git
repository.
Some paths have changed so files were not excluded correctly and now
upstream
and pristine-tar contain jquery*.js files.
How can I remove the files after having tagged?
I read that the pristine-tar branch should be removed [1]. Is that
correct?
Regards
Gudjon
Hi Gudjon,
It depends on whether you have pushed to a remote repository yet, or
whether it's still only on your local machine. If you've already
pushed, then you'll have to update your local versions and give it a different version number (for example, +ds2 rather than +ds1), doing a
fresh gbp import-orig on the repacked source package.
If you're still only on your local machine, this is an error I have
made a number of times, only noticing after doing gpb import-orig. To
fix it, you can roll back the gbp import-orig. With care, do the
following (where git co is shorthand for git checkout):
git co debian/unstable [or whatever your branch is]
git log
git reset --hard <commit ref of commit just before the gbp import-orig>
git co upstream
git log
git reset --hard <commit ref of commit just before the gbp import-orig>
git co pristine-tar
git log
git reset --hard <commit ref of commit just before the gbp import-orig>
git tag -d upstream/<upstream version number of wrongly imported package>
There is probably a better way to do it, but this has worked for me.
Good luck!
Julian
<div dir="ltr"><div>Thanks Andrius and Julian</div><div><br></div><div>Forgot to mention that I had already pushed my changes.</div><div>I will try to adapt to the new git standard but that will be my Christmas project.</div><div>Julian, your solution
with a new tag worked perfectly but I won't push my changes until it is lintian clean.</div><div><br></div><div>Regards</div><div>Gudjon<br></div><div><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Dec 5, 2022
at 1:04 PM Julian Gilbey <<a href="mailto:
julian@d-and-j.net">
julian@d-and-j.net</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Mon, Dec 05, 2022 at
06:24:48AM +0000, Guðjón Guðjónsson wrote:<br>
> Hi list<br>
> I am working on eric and I made a mistake while updating the git repository.<br>
> Some paths have changed so files were not excluded correctly and now upstream<br>
> and pristine-tar contain jquery*.js files.<br>
> How can I remove the files after having tagged?<br>
> I read that the pristine-tar branch should be removed [1]. Is that correct?<br>
> Regards<br>
> Gudjon<br>
Hi Gudjon,<br>
It depends on whether you have pushed to a remote repository yet, or<br> whether it's still only on your local machine. If you've already<br> pushed, then you'll have to update your local versions and give it a<br> different version number (for example, +ds2 rather than +ds1), doing a<br> fresh gbp import-orig on the repacked source package.<br>
If you're still only on your local machine, this is an error I have<br> made a number of times, only noticing after doing gpb import-orig. To<br>
fix it, you can roll back the gbp import-orig. With care, do the<br> following (where git co is shorthand for git checkout):<br>
git co debian/unstable [or whatever your branch is]<br>
git log<br>
git reset --hard <commit ref of commit just before the gbp import-orig><br>
git co upstream<br>
git log<br>
git reset --hard <commit ref of commit just before the gbp import-orig><br>
git co pristine-tar<br>
git log<br>
git reset --hard <commit ref of commit just before the gbp import-orig><br>
git tag -d upstream/<upstream version number of wrongly imported package><br>
There is probably a better way to do it, but this has worked for me.<br>
Good luck!<br>
  Julian<br>
</blockquote></div>
--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)