<div dir="ltr">Hi Roberto,<div><br></div><div>Thank you for overcoming this last hurdle in the configuration and contents of the git repository for BibleTime.</div><div><br></div><div>I have done all the steps you mentioned and after doing all of those, the package builds well, and is identical to the earlier built package, from where I conclude that all changes to the repository did not change its actual data in the three branches master, upstream, and pristine-tar. </div><div><br></div><div>I have learned a lot during this week, and have written it all down, and expect that next time things will go much better.</div><div><br></div><div>May I ask your help for reviewing and uploading the package.</div><div><br></div><div>Blessings!</div><div><br></div><div>Teus.</div></div><br><div class="gmail_quote"><div dir="ltr">On Fri, 6 Oct 2017 at 14:57 Roberto C. Sánchez <<a href="mailto:roberto@debian.org">roberto@debian.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Fri, Oct 06, 2017 at 12:01:14PM +0000, Teus Benschop wrote:<br>
> Hi Roberto,<br>
> Sorry about the mess I created in the bibletime repository.<br>
> Thanks for all the explanations and clear steps to be taken to fix it all<br>
> again.<br>
> All steps have now been taken, and I've made notes of all points in a<br>
> script, so I expect that next time things will work out better than they<br>
> worked out now.<br>
> I now have a better view of how to work with gbp, that helps a lot.<br>
> The debian/2.11.0-1 tag was removed locally and remotely, and once the<br>
> package has been reviewed and uploaded, I can tag it again to that<br>
> version.<br>
> Everything was pushed to the remote repository, yes, some --force was<br>
> needed here and there - I didn't take an exact note of when to use force,<br>
> but all looks clear now and clean.<br>
> The package was build again, and also compared to the package I built<br>
> yesterday, and they agree in all aspects, so I expect that the package is<br>
> good now, it built without errors, and yesterday's package was tested on<br>
> Debian sid GUI and today's package is the same.<br>
> May I ask for your help to review the package?<br>
> Teus.<br>
<br>
Hi Teus,<br>
<br>
Things were still not quite right. I forgot that Git on Alioth is<br>
configured to reject non-fastforward pushes. As a result, the final<br>
force push of master was rejected and it told you to pull first. That<br>
pull resulted in a new merge of the upstream changes which my documented<br>
steps for you were meant to discard.<br>
<br>
I had to log in to the shell on Alioth, disable the configuration option<br>
that rejects non-fastforward commits and push an update to master that<br>
undoes the final merge commit you did.<br>
<br>
Before when you pushed, the repository history looked like this:<br>
<br>
* 4de6fea Merge branch 'master' of git+ssh://<a href="http://scm.alioth.debian.org/git/pkg-crosswire/bibletime" rel="noreferrer" target="_blank">scm.alioth.debian.org/git/pkg-crosswire/bibletime</a><br>
|\<br>
| * 27d7b39 Import Debian changes 2.11.0-1<br>
| * b17dfe5 Fixes for unknown-paragraph-in-dep5-copyright paragraph and for binary-without-manpage lintian W's<br>
<br>
[snip several commits from the old development line]<br>
<br>
| * 428aece upstream 2.11.0<br>
| * b67cfaa write test<br>
| * 4b859b8 test write access<br>
* | 51fae4d Fixes for unknown-paragraph-in-dep5-copyright paragraph and for binary-without-manpage lintian W's<br>
* | 7083c04 Fixed: bibletime source: syntax-error-in-dep5-copyright line 61: Continuation line outside a paragraph (ma<br>
* | 47d5310 Fix for missing manpage bibletime<br>
* | eac6bf7 Fixed:bibletime: binary-without-manpage usr/bin/bibletime<br>
* | 9d2d1c1 Fixed: debian-changelog-has-wrong-day-of-week 2017-10-04 is a Wednesday<br>
* | 1525d94 Fixed: W: bibletime source: missing-license-paragraph-in-dep5-copyright gpl-2.0 (paragraph at line 10)<br>
<br>
Now it looks like this:<br>
<br>
* 51fae4d (HEAD, origin/master, origin/HEAD, master) Fixes for unknown-paragraph-in-dep5-copyright paragraph and for binary-without-manpage lintian W's<br>
* 7083c04 Fixed: bibletime source: syntax-error-in-dep5-copyright line 61: Continuation line outside a paragraph (maybe line 60 should be " .").<br>
* 47d5310 Fix for missing manpage bibletime<br>
* eac6bf7 Fixed:bibletime: binary-without-manpage usr/bin/bibletime<br>
* 9d2d1c1 Fixed: debian-changelog-has-wrong-day-of-week 2017-10-04 is a Wednesday<br>
* 1525d94 Fixed: W: bibletime source: missing-license-paragraph-in-dep5-copyright gpl-2.0 (paragraph at line 10)<br>
* ae2001a Fixed: bibletime source: unknown-paragraph-in-dep5-copyright paragraph at line 3<br>
* 935a46c Add debian/bibletime.1 man page<br>
* 19f94a5 Standards-Version: 4.1.1<br>
* c582441 bibletime source: syntax-error-in-dep5-copyright line 30: Continuation line outside a paragraph (maybe line 29 should be " .").<br>
* 02f374b Updated Build-Depends<br>
* 2eac89b updated debian/changelog<br>
* 6450fea debian/rules: override_dh_auto_test because the test rely on a display which is not there<br>
* 9819215 debian/patches/series: remove already applied patches<br>
* 94d5fb4 debian/control: updated Build-Depends, Uploaders<br>
* a8ffd9a updated changelog<br>
* 2524bee updated changelog<br>
* 167d33d Updated debian/copyright<br>
* 526e111 Make debian/copyright machine-readable<br>
* 3f488d3 Updated version 2.11.0 from 'upstream/2.11.0'<br>
|\<br>
| * 90d2181 (tag: upstream/2.11.0, origin/upstream, upstream) New upstream version 2.11.0<br>
<br>
You will notice that the master reference points to 51fae4d instead of<br>
the merge commit 4de6fea. I have effectively orphaned the merge commit<br>
and its ancestors in the old line of development where you inadvertently<br>
pulled the upstream changes into the master branch.<br>
<br>
I did create a backup copy of the repository on Alioth prior to making<br>
this change, so we can restore it if becomes necessary. To set your<br>
repository back to where it matches what is on Alioth, please execute<br>
these commands:<br>
<br>
echo 51fae4d11d6b75845daeeb19109ad6ff9ca88ff2 >.git/refs/heads/master<br>
echo 51fae4d11d6b75845daeeb19109ad6ff9ca88ff2 >.git/refs/remotes/origin/master<br>
<br>
You may want to make a backup of your local working copy in case<br>
something goes wrong. Though, you can always create a new clone from<br>
Aioth instead.<br>
<br>
Note that those commands will change git's idea of where master and<br>
origin/master actually point in your repository. After executing the<br>
commands, run 'git --log --branches --oneline' and confirm that the<br>
history looks like my history after the change that I made. If it does,<br>
you should be able to 'git pull' and have git tell you that it is up to<br>
date.<br>
<br>
Once that is done, please build and test the package once again and then<br>
I will review it for upload.<br>
<br>
Regards,<br>
<br>
-Roberto<br>
<br>
--<br>
Roberto C. Sánchez<br>
<br>
_______________________________________________<br>
Pkg-crosswire-devel mailing list<br>
<a href="mailto:Pkg-crosswire-devel@lists.alioth.debian.org" target="_blank">Pkg-crosswire-devel@lists.alioth.debian.org</a><br>
<a href="http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel" rel="noreferrer" target="_blank">http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel</a><br>
</blockquote></div>