From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 29 Apr 2014 19:40:12 +0000 (+0100)
Subject: move graftmergein (nfc)
X-Git-Tag: cvs-to-git-conversion^2~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=commitdiff_plain;h=f909d6d61d1bee21ac400733261e07942267f69e;ds=sidebyside

move graftmergein (nfc)
---

diff --git a/convert b/convert
index 2bcace4..1acc6cf 100755
--- a/convert
+++ b/convert
@@ -37,15 +37,6 @@ abandondatedbranch () {
 	abandonbranch branch-$date-$olddesc abandon.$date.$newdesc
 	ensurenotag branchpoint-$date-$olddesc master
 }
-
-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 () {
 	local desc=$1
 	local mergecommit=$2
@@ -61,6 +52,14 @@ END
 	ensurenotag branchpoint-$desc
 }
 
+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