<div dir="ltr">I'm ready.<br><br><div class="gmail_quote"><div dir="ltr">On Sun, Mar 5, 2017 at 12:26 PM Eric S. Raymond <<a href="mailto:esr@thyrsus.com">esr@thyrsus.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Mark has asked me to try to graft onto our repository a branch<br class="gmail_msg">
representing NTP Classic development since the fork.<br class="gmail_msg">
<br class="gmail_msg">
For ugly reasons that I will detail in later mail, I think this is<br class="gmail_msg">
just barely doable, but not with conventional git operations.<br class="gmail_msg">
It will take reposurgeon to get the job done.<br class="gmail_msg">
<br class="gmail_msg">
That means we need to develop a protocol for doing surgery on the GitLab<br class="gmail_msg">
repository in such a way that everyone's pending work (whether tip<br class="gmail_msg">
changes, private branges, or merge requests) is preserved and can be<br class="gmail_msg">
reapplied afterwards.<br class="gmail_msg">
<br class="gmail_msg">
I don't want us to have to debug that protocol while I'm dealing with a<br class="gmail_msg">
serious tangle - and the branch graft is a serious tangle. So I intend<br class="gmail_msg">
to do a surgical test with low stakes first. The low stakes are "let's<br class="gmail_msg">
fix typos in old comments without modifying code or repository topology".<br class="gmail_msg">
That way, even if the graft attempt fails (which is possible) we'll<br class="gmail_msg">
at least have gained *something* from the whole exercise.<br class="gmail_msg">
<br class="gmail_msg">
Here's how I think it needs to go:<br class="gmail_msg">
<br class="gmail_msg">
1. When you read this, push any public changes you have ready.<br class="gmail_msg">
<br class="gmail_msg">
2. If you have private branches, save each one as a patch sequence.<br class="gmail_msg">
Make note of the branch point.<br class="gmail_msg">
<br class="gmail_msg">
3. Reply to this message telling me you're ready - especially if you<br class="gmail_msg">
are Gary, Matt, or Hal.<br class="gmail_msg">
<br class="gmail_msg">
4. I will then schedule a brief repo outage for the surgery.<br class="gmail_msg">
<br class="gmail_msg">
5. When I'm done, I'll announce it here. At that point the following<br class="gmail_msg">
things will need to happen:<br class="gmail_msg">
<br class="gmail_msg">
6. You guys restore your private branches.<br class="gmail_msg">
<br class="gmail_msg">
7. Mark will need to re-make the signed release tags.<br class="gmail_msg">
<br class="gmail_msg">
One of the reasons I want to do this is to find out if GitLab's issue<br class="gmail_msg">
and merge-tracker logic is capqable of resynching itself to the new<br class="gmail_msg">
hash sequence after surgery. For example under issue #247 the<br class="gmail_msg">
page says "Eric S. Raymond @esr mentioned in commit 6e45c35a a week<br class="gmail_msg">
ago" with that commit titled<br class="gmail_msg">
<br class="gmail_msg">
Revert "Address GitLab issue #247: Extra precision for avgint field..."<br class="gmail_msg">
<br class="gmail_msg">
It'll be important to note what happens to this reference post-surgery.<br class="gmail_msg">
--<br class="gmail_msg">
<a href="<a href="http://www.catb.org/~esr/" rel="noreferrer" class="gmail_msg" target="_blank">http://www.catb.org/~esr/</a>">Eric S. Raymond</a><br class="gmail_msg">
<br class="gmail_msg">
Hoplophobia (n.): The irrational fear of weapons, correctly described by<br class="gmail_msg">
Freud as "a sign of emotional and sexual immaturity". Hoplophobia, like<br class="gmail_msg">
homophobia, is a displacement symptom; hoplophobes fear their own<br class="gmail_msg">
"forbidden" feelings and urges to commit violence. This would be<br class="gmail_msg">
harmless, except that they project these feelings onto others. The<br class="gmail_msg">
sequelae of this neurosis include irrational and dangerous behaviors<br class="gmail_msg">
such as passing "gun-control" laws and trashing the Constitution.<br class="gmail_msg">
_______________________________________________<br class="gmail_msg">
devel mailing list<br class="gmail_msg">
<a href="mailto:devel@ntpsec.org" class="gmail_msg" target="_blank">devel@ntpsec.org</a><br class="gmail_msg">
<a href="http://lists.ntpsec.org/mailman/listinfo/devel" rel="noreferrer" class="gmail_msg" target="_blank">http://lists.ntpsec.org/mailman/listinfo/devel</a><br class="gmail_msg">
</blockquote></div></div>