X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/f909d6d61d1bee21ac400733261e07942267f69e..ceaf70dbd1b58bb51a65f905b845505e00b54037:/convert?ds=sidebyside

diff --git a/convert b/convert
index 1acc6cf..60b1998 100755
--- a/convert
+++ b/convert
@@ -55,13 +55,13 @@ END
 abandonbranch branch-rrtypenoenum abandon.1998-10-04.rrtypenoenum
 abandondatedbranch 1999-04-10 mthread multithread
 abandondatedbranch 1999-04-11 ipv6
-abandondatedbranch 1999-04-11 pollfds
 
 abandondatedbranch 2000-05-07 ipv6
 abandonbranch branch-0-7-inftodebug abandon.2000-03-26.infotodebug-0.7
 
 graftmergein logcallbackfn 741a795cdaa539b48f83afbc0ac8e471543b9bf6
 graftmergein 1999-05-09-gplvslgpl e7cf3a99e5829bf53a9f36e08769787a78261045
+graftmergein 1999-04-11-pollfds f889c99835eec14dacda4b18da0636911dcd8cbc
 
 xargs git tag -d <<END
 tochiark-1998-11-08
@@ -75,7 +75,7 @@ END
 
 git checkout master
 scr=cvs-to-git-conversion-script
-cp $base/convert $scr
+cp $base/script/convert $scr
 git add $scr
 git commit -m "$scr: record the script