I2P_Developers/i2p.i2p
3
1
Fork 11
Code Issues 339 Pull Requests 13 Actions 6 Packages Projects Releases Wiki Activity

Migrate from ant to gradle #489

New Issue
Open
opened 2025-04-21 15:11:35 -04:00 by idk · 4 comments
idk commented 2025-04-21 15:11:35 -04:00
Owner
Copy Link

ant requires system dependent libraries to be installed and doesn't handle dependencies. That leads to a system-dependent building process which gradle does away with.

Since most of the project build is done in ant, this should be quite the undertaking and might require milestones. I'll try and define a roadmap of how best to do this. Input is very welcome of course as I'm only getting back into Java and missed the introduction of Gradle completely.

These are all the ant targets (ant -p) and their migration status

Default target: all

  • -areRouterInfosEnabled
  • -pre-release
  • -pre-sign
  • -releaseit
  • -setepoch
  • -sign-update
  • all
  • bbLauncher
  • bench
  • bionic
  • build
  • build2
  • buildAddressbook
  • buildAddressbookJar
  • buildBOB
  • buildCore
  • buildCoreTest
  • buildDesktopGui
  • buildI2PControl
  • buildI2PSnark
  • buildI2PTunnel
  • buildI2PTunnelJars
  • buildImagegen
  • buildJetty
  • buildJrobin
  • buildMinistreaming
  • buildNewsXMLJar
  • buildProperties
  • buildRouter
  • buildRouterConsole
  • buildRouterTest
  • buildSAM
  • buildSmall
  • buildSmallOnly
  • buildStreaming
  • buildSusiDNS
  • buildSusiMail
  • buildSusiMailJar
  • buildSystray
  • buildTest
  • buildTools
  • buildUtilityJar
  • buildWEB
  • buildclean
  • builddep
  • builddepSmall
  • buildexe
  • buildrouter
  • bump
  • bumpBuild
  • buster
  • checkForGit
  • checkForIzpack2App
  • checkForMtn
  • checkForVCS
  • checkIfBumped
  • checkIfBumpedGit
  • checkIfBumpedMtn
  • checkoutFromGit
  • checkoutFromMtn
  • checkoutFromVCS
  • clean
  • clover.report
  • cobertura.report
  • consoleDocs
  • copy-bionic
  • copy-disco
  • copy-precise
  • copy-trusty
  • copy-xenial
  • copyJavadoc
  • copyflags
  • copyflags-unlesspkg
  • copyjetty
  • copyjetty-unlesspkg
  • copyjstl-unlesspkg
  • copystandard-unlesspkg
  • copystandard-unlesspkg1
  • copystandard-unlesspkg2
  • copytomcat-unlesspkg
  • debchange
  • debcheckpatch
  • debian
  • debian-binary
  • debian-clean
  • debian-patch
  • debian-release-tarball
  • debian-tarball
  • debian-unpatch
  • debianhowto
  • debianrepo
  • delete-j6-update
  • delete-nonwindows
  • deletepkg-temp
  • disableManifestClasspath
  • disco
  • dist
  • dist200
  • distclean
  • ensureIzpack5
  • failIfNoMtn
  • failIfNoVCS
  • findbugs
  • forceJava7
  • fulltest
  • getBuildNumber
  • getExtendedVersion
  • getGitRev
  • getMtnRev
  • getReleaseNumber
  • git-bundle
  • help
  • i2pseeds
  • i2psnark
  • installer
  • installer-all
  • installer-freebsd
  • installer-linux
  • installer-nowindows
  • installer-osx
  • installer-windows
  • installer2app
  • installer5
  • installer5-linux
  • installer5-nowindows
  • installer5-windows
  • installer5exe
  • installerexe
  • izpack-patches
  • izpack5-patches
  • jar
  • jarBote
  • jarSmall
  • javadoc
  • javadoc-test
  • javadoc-zip
  • jbigi
  • jbigi-freebsd-only
  • jbigi-linux-nonx86-only
  • jbigi-linux-only
  • jbigi-linux-x86-64-only
  • jbigi-linux-x86-only
  • jbigi-list-changes
  • jbigi-nowindows
  • jbigi-osx-only
  • jbigi-windows-only
  • jenkins.cobertura.report
  • jessie
  • junit.report
  • junit.test
  • justBOB
  • launch4j
  • mavenCentral
  • mavenCentral.deps
  • mavenLocal
  • mavenLocal.deps
  • osxLauncher
  • pack200
  • pkg
  • pkg-portable-clean
  • pkg-portable-win32
  • pkg200
  • pkgclean
  • poupdate
  • poupdate-source
  • precise
  • precise-release-tarball
  • prep-script-translation
  • prepCertificates
  • prepConsoleDocs
  • prepRouterInfos
  • prepTest
  • prepgeoupdate
  • prepgeoupdate-unlesspkg
  • prepjbigiupdate
  • prepjupdate
  • prepjupdatefixes
  • preplicenses
  • preplicenses-unlesspkg
  • preplicenses-windows
  • preppkg
  • preppkg-base
  • preppkg-freebsd
  • preppkg-freebsd-only
  • preppkg-linux
  • preppkg-linux-nonx86
  • preppkg-linux-only
  • preppkg-linux-x86
  • preppkg-nowindows
  • preppkg-osx
  • preppkg-osx-only
  • preppkg-portable-basic
  • preppkg-portable-linux-jbigi
  • preppkg-portable-win32
  • preppkg-portable-win32-jbigi
  • preppkg-unix
  • preppkg-windows
  • preppkg-windows-only
  • preppkgRepack
  • prepupdate
  • prepupdateRouter
  • prepupdateSmall
  • release
  • release200
  • releaseRepack
  • releaseWithGeoIP
  • releaseWithGeoIP200
  • releaseWithGeoIPRepack
  • releaseWithJbigi
  • releaseWithJbigi200
  • releaseWithJbigiRepack
  • repack200
  • revisions
  • revisionsGit
  • revisionsMtn
  • scalatest.report
  • scalatest.test
  • set-lg2-en
  • setBuildTimestamp
  • settomcatprop
  • signed-updater200
  • signed-updater200WithJavadoc
  • signed-updater200WithJavadocAndJetty
  • signed-updater200WithJetty
  • signed-updater200WithJettyAndGeoIP
  • slackpkg
  • sloccount.report
  • tarball
  • test
  • test.report
  • testCore
  • testMinistreaming
  • testRouter
  • testStreaming
  • testscripts
  • testscripts-all
  • testscripts-net
  • trimRev
  • truncatehistory
  • trusty
  • updateTest
  • updater
  • updater-torrent
  • updater200
  • updater200WithJavadoc
  • updater200WithJavadocAndJetty
  • updater200WithJbigi
  • updater200WithJetty
  • updater200WithJettyAndGeoIP
  • updater200WithJettyAndJbigi
  • updater200WithJettyFixes
  • updater200WithJettyFixesAndJbigi
  • updaterRepack
  • updaterRouter
  • updaterSmall
  • updaterWithGeoIP
  • updaterWithJavadoc
  • updaterWithJavadocAndJetty
  • updaterWithJbigi
  • updaterWithJetty
  • updaterWithJettyAndGeoIP
  • updaterWithJettyAndGeoIPRepack
  • updaterWithJettyAndJbigi
  • updaterWithJettyAndJbigiRepack
  • updaterWithJettyFixes
  • updaterWithJettyFixesAndGeoIP
  • updaterWithJettyFixesAndJbigi
  • updaterWithJettyRepack
  • util-list-changes
  • verifyReleaseBuildNumbers
  • webappDistclean
  • wheezy
  • xenial
  • xenial-release-tarball
  • zipit
  • zipit200
`ant` requires system dependent libraries to be installed and doesn't handle dependencies. That leads to a system-dependent building process which `gradle` does away with. Since most of the project build is done in ant, this should be quite the undertaking and might require milestones. I'll try and define a roadmap of how best to do this. Input is very welcome of course as I'm only getting back into Java and missed the introduction of Gradle completely. These are all the ant targets (`ant -p`) and their migration status Default target: all - [ ] -areRouterInfosEnabled - [ ] -pre-release - [ ] -pre-sign - [ ] -releaseit - [ ] -setepoch - [ ] -sign-update - [ ] all - [ ] bbLauncher - [ ] bench - [ ] bionic - [ ] build - [ ] build2 - [ ] buildAddressbook - [ ] buildAddressbookJar - [ ] buildBOB - [ ] buildCore - [ ] buildCoreTest - [ ] buildDesktopGui - [ ] buildI2PControl - [ ] buildI2PSnark - [ ] buildI2PTunnel - [ ] buildI2PTunnelJars - [ ] buildImagegen - [ ] buildJetty - [ ] buildJrobin - [ ] buildMinistreaming - [ ] buildNewsXMLJar - [ ] buildProperties - [ ] buildRouter - [ ] buildRouterConsole - [ ] buildRouterTest - [ ] buildSAM - [ ] buildSmall - [ ] buildSmallOnly - [ ] buildStreaming - [ ] buildSusiDNS - [ ] buildSusiMail - [ ] buildSusiMailJar - [ ] buildSystray - [ ] buildTest - [ ] buildTools - [ ] buildUtilityJar - [ ] buildWEB - [ ] buildclean - [ ] builddep - [ ] builddepSmall - [ ] buildexe - [ ] buildrouter - [ ] bump - [ ] bumpBuild - [ ] buster - [ ] checkForGit - [ ] checkForIzpack2App - [ ] checkForMtn - [ ] checkForVCS - [ ] checkIfBumped - [ ] checkIfBumpedGit - [ ] checkIfBumpedMtn - [ ] checkoutFromGit - [ ] checkoutFromMtn - [ ] checkoutFromVCS - [ ] clean - [ ] clover.report - [ ] cobertura.report - [ ] consoleDocs - [ ] copy-bionic - [ ] copy-disco - [ ] copy-precise - [ ] copy-trusty - [ ] copy-xenial - [ ] copyJavadoc - [ ] copyflags - [ ] copyflags-unlesspkg - [ ] copyjetty - [ ] copyjetty-unlesspkg - [ ] copyjstl-unlesspkg - [ ] copystandard-unlesspkg - [ ] copystandard-unlesspkg1 - [ ] copystandard-unlesspkg2 - [ ] copytomcat-unlesspkg - [ ] debchange - [ ] debcheckpatch - [ ] debian - [ ] debian-binary - [ ] debian-clean - [ ] debian-patch - [ ] debian-release-tarball - [ ] debian-tarball - [ ] debian-unpatch - [ ] debianhowto - [ ] debianrepo - [ ] delete-j6-update - [ ] delete-nonwindows - [ ] deletepkg-temp - [ ] disableManifestClasspath - [ ] disco - [ ] dist - [ ] dist200 - [ ] distclean - [ ] ensureIzpack5 - [ ] failIfNoMtn - [ ] failIfNoVCS - [ ] findbugs - [ ] forceJava7 - [ ] fulltest - [ ] getBuildNumber - [ ] getExtendedVersion - [ ] getGitRev - [ ] getMtnRev - [ ] getReleaseNumber - [ ] git-bundle - [ ] help - [ ] i2pseeds - [ ] i2psnark - [ ] installer - [ ] installer-all - [ ] installer-freebsd - [ ] installer-linux - [ ] installer-nowindows - [ ] installer-osx - [ ] installer-windows - [ ] installer2app - [ ] installer5 - [ ] installer5-linux - [ ] installer5-nowindows - [ ] installer5-windows - [ ] installer5exe - [ ] installerexe - [ ] izpack-patches - [ ] izpack5-patches - [ ] jar - [ ] jarBote - [ ] jarSmall - [ ] javadoc - [ ] javadoc-test - [ ] javadoc-zip - [ ] jbigi - [ ] jbigi-freebsd-only - [ ] jbigi-linux-nonx86-only - [ ] jbigi-linux-only - [ ] jbigi-linux-x86-64-only - [ ] jbigi-linux-x86-only - [ ] jbigi-list-changes - [ ] jbigi-nowindows - [ ] jbigi-osx-only - [ ] jbigi-windows-only - [ ] jenkins.cobertura.report - [ ] jessie - [ ] junit.report - [ ] junit.test - [ ] justBOB - [ ] launch4j - [ ] mavenCentral - [ ] mavenCentral.deps - [ ] mavenLocal - [ ] mavenLocal.deps - [ ] osxLauncher - [ ] pack200 - [ ] pkg - [ ] pkg-portable-clean - [ ] pkg-portable-win32 - [ ] pkg200 - [ ] pkgclean - [ ] poupdate - [ ] poupdate-source - [ ] precise - [ ] precise-release-tarball - [ ] prep-script-translation - [ ] prepCertificates - [ ] prepConsoleDocs - [ ] prepRouterInfos - [ ] prepTest - [ ] prepgeoupdate - [ ] prepgeoupdate-unlesspkg - [ ] prepjbigiupdate - [ ] prepjupdate - [ ] prepjupdatefixes - [ ] preplicenses - [ ] preplicenses-unlesspkg - [ ] preplicenses-windows - [ ] preppkg - [ ] preppkg-base - [ ] preppkg-freebsd - [ ] preppkg-freebsd-only - [ ] preppkg-linux - [ ] preppkg-linux-nonx86 - [ ] preppkg-linux-only - [ ] preppkg-linux-x86 - [ ] preppkg-nowindows - [ ] preppkg-osx - [ ] preppkg-osx-only - [ ] preppkg-portable-basic - [ ] preppkg-portable-linux-jbigi - [ ] preppkg-portable-win32 - [ ] preppkg-portable-win32-jbigi - [ ] preppkg-unix - [ ] preppkg-windows - [ ] preppkg-windows-only - [ ] preppkgRepack - [ ] prepupdate - [ ] prepupdateRouter - [ ] prepupdateSmall - [ ] release - [ ] release200 - [ ] releaseRepack - [ ] releaseWithGeoIP - [ ] releaseWithGeoIP200 - [ ] releaseWithGeoIPRepack - [ ] releaseWithJbigi - [ ] releaseWithJbigi200 - [ ] releaseWithJbigiRepack - [ ] repack200 - [ ] revisions - [ ] revisionsGit - [ ] revisionsMtn - [ ] scalatest.report - [ ] scalatest.test - [ ] set-lg2-en - [ ] setBuildTimestamp - [ ] settomcatprop - [ ] signed-updater200 - [ ] signed-updater200WithJavadoc - [ ] signed-updater200WithJavadocAndJetty - [ ] signed-updater200WithJetty - [ ] signed-updater200WithJettyAndGeoIP - [ ] slackpkg - [ ] sloccount.report - [ ] tarball - [ ] test - [ ] test.report - [ ] testCore - [ ] testMinistreaming - [ ] testRouter - [ ] testStreaming - [ ] testscripts - [ ] testscripts-all - [ ] testscripts-net - [ ] trimRev - [ ] truncatehistory - [ ] trusty - [ ] updateTest - [ ] updater - [ ] updater-torrent - [ ] updater200 - [ ] updater200WithJavadoc - [ ] updater200WithJavadocAndJetty - [ ] updater200WithJbigi - [ ] updater200WithJetty - [ ] updater200WithJettyAndGeoIP - [ ] updater200WithJettyAndJbigi - [ ] updater200WithJettyFixes - [ ] updater200WithJettyFixesAndJbigi - [ ] updaterRepack - [ ] updaterRouter - [ ] updaterSmall - [ ] updaterWithGeoIP - [ ] updaterWithJavadoc - [ ] updaterWithJavadocAndJetty - [ ] updaterWithJbigi - [ ] updaterWithJetty - [ ] updaterWithJettyAndGeoIP - [ ] updaterWithJettyAndGeoIPRepack - [ ] updaterWithJettyAndJbigi - [ ] updaterWithJettyAndJbigiRepack - [ ] updaterWithJettyFixes - [ ] updaterWithJettyFixesAndGeoIP - [ ] updaterWithJettyFixesAndJbigi - [ ] updaterWithJettyRepack - [ ] util-list-changes - [ ] verifyReleaseBuildNumbers - [ ] webappDistclean - [ ] wheezy - [ ] xenial - [ ] xenial-release-tarball - [ ] zipit - [ ] zipit200
idk commented 2025-04-21 15:11:35 -04:00
Author
Owner
Copy Link

How are dependencies retrieved for debian builds?

How are dependencies retrieved for debian builds?
idk commented 2025-04-21 15:11:36 -04:00
Author
Owner
Copy Link

To make it even more explicit: Debian policy prohibits downloads in the build process, period.

To make it even more explicit: Debian policy prohibits downloads in the build process, period.
idk commented 2025-04-21 15:11:36 -04:00
Author
Owner
Copy Link
  • jsps are all precompiled after my recent changes
  • gettext is done after my recent changes, by calling out to the bundle shell scripts
  • yes you could do the gettext in pure gradle (str4d did it for bote), I peeked at what he did, and decided not to be cause it's GPLv3 and it's complex
  • most of the other exceptions listed by zab aren't important unless ant is going away, which is what OP assumes? BUT:

The title of the MR assumes that we have a goal to replace ant with gradle. We do not. Gradle was half-assed by str4d years ago for unknown reasons, then brought back to life by zab recently so his IDE would work. I did a number of fixups to get it closer.

See http://zzz.i2p/topics/3034 post 2 for some reasons why ant's not going away.

plus, gradle is terrible for anonymity since it's yanking everything over the internet.

- jsps are all precompiled after my recent changes - gettext is done after my recent changes, by calling out to the bundle shell scripts - yes you could do the gettext in pure gradle (str4d did it for bote), I peeked at what he did, and decided not to be cause it's GPLv3 and it's complex - most of the other exceptions listed by zab aren't important unless ant is going away, which is what OP assumes? BUT: The title of the MR assumes that we have a goal to replace ant with gradle. We do not. Gradle was half-assed by str4d years ago for unknown reasons, then brought back to life by zab recently so his IDE would work. I did a number of fixups to get it closer. See http://zzz.i2p/topics/3034 post 2 for some reasons why ant's not going away. plus, gradle is terrible for anonymity since it's yanking everything over the internet.
idk commented 2025-04-21 15:11:36 -04:00
Author
Owner
Copy Link

Many of the ant targets in the list above are interim i.e. they will not have 1:1 mapping with Gradle targets or more accurately the built-in targets that Gradle provides take care of their functionality.

Currently, the Gradle build systems is complete to the degree that it compiles the code and allows it to be imported in an IDE (IntelliJ and Eclipse confirmed working). @zzz did some work after that to make sure the jars built by Gradle match the jars built by Ant.

Of the top of my head, the main remaining pieces of functionality are:

  • izPack installers for the various systems
  • pre-compiling JSPs
  • gettext
  • signing updaters
  • anything that has to do with Debian
  • standalone I2PSnark

There are complications related to each of those tasks:

IzPack: there is support for using IzPack 4 and 5. The jars for 4 are checked into the code, but jars for 5 are not. I have no idea if IzPack is available in MavenCentral or how best to integrate them into a standard Gradle pipeline

Pre-compiling JSPs: doable, see the MuWire webui subproject

Gettext: same as above. You may need to resort to calling the gettext executable from the Gradle script.

Signing updaters: that is doable but requires some trickery with the buildscript classpath. See the MuWire plug subproject for ideas.

Debian: never built it myself, the only thing I can say is that it is a reproducible build and that may complicate things. You will probably need to resort to using some Gradle plugin.

Standalone I2PSnark: nothing I can say here, but since this is a separate "product" it can stay on Ant I think.

Many of the ant targets in the list above are interim i.e. they will not have 1:1 mapping with Gradle targets or more accurately the built-in targets that Gradle provides take care of their functionality. Currently, the Gradle build systems is complete to the degree that it compiles the code and allows it to be imported in an IDE (IntelliJ and Eclipse confirmed working). @zzz did some work after that to make sure the jars built by Gradle match the jars built by Ant. Of the top of my head, the main remaining pieces of functionality are: * izPack installers for the various systems * pre-compiling JSPs * gettext * signing updaters * anything that has to do with Debian * standalone I2PSnark There are complications related to each of those tasks: IzPack: there is support for using IzPack 4 and 5. The jars for 4 are checked into the code, but jars for 5 are not. I have no idea if IzPack is available in MavenCentral or how best to integrate them into a standard Gradle pipeline Pre-compiling JSPs: doable, see the MuWire `webui` subproject Gettext: same as above. You may need to resort to calling the `gettext` executable from the Gradle script. Signing updaters: that is doable but requires some trickery with the `buildscript` classpath. See the MuWire `plug` subproject for ideas. Debian: never built it myself, the only thing I can say is that it is a reproducible build and that may complicate things. You will probably need to resort to using some Gradle plugin. Standalone I2PSnark: nothing I can say here, but since this is a separate "product" it can stay on Ant I think.
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
#1026
#1031
#1033
#1036
#1040
#1049
#1051
#1065
#1067
#1076
#1105
#1112
#1139
#1166
#1170
#1172
#1176
#1200
#1222
#1223
#1259
#1263
#1274
#1289
#1302
#1304
#1306
#1308
#1320
#1337
#1338
#1372
#1381
#1384
#1393
#1399
#1410
#1415
#1418
#1438
#1453
#1460
#1479
#1491
#1499
#1519
#1522
#1560
#1564
#1584
#1609
#1613
#1637
#1655
#1657
#1684
#1685
#1689
#1694
#1697
#1716
#1724
#1740
#1742
#1753
#1758
#1766
#1767
#1775
#1802
#1805
#1834
#1837
#1838
#1847
#1848
#1869
#1877
#1893
#1907
#1911
#1915
#1928
#1938
#1951
#1979
#1981
#1982
#1985
#1990
#1999
#2018
#2023
#2024
#2035
#2039
#2056
#2080
#2081
#2083
#2085
#2086
#2088
#2090
#2099
#2100
#2101
#2102
#2106
#2110
#2112
#2114
#2121
#2142
#2145
#2146
#2147
#2149
#2158
#2160
#2162
#2169
#2173
#2177
#2182
#2193
#2212
#2221
#2230
#2231
#2233
#2238
#2240
#2241
#2244
#2251
#2252
#2255
#2257
#2259
#2261
#2263
#2264
#2265
#2269
#2271
#2274
#2275
#2278
#2281
#2297
#23
#2302
#2303
#2304
#2305
#2306
#2309
#2319
#2323
#2324
#2325
#2336
#2337
#2340
#2341
#2346
#2350
#2363
#2371
#2374
#2375
#2376
#2381
#2386
#2393
#2396
#2402
#2411
#2420
#2421
#2426
#2428
#2429
#2431
#2433
#2434
#2446
#2459
#2467
#2472
#2475
#2496
#2497
#2506
#2509
#2512
#2540
#2562
#2572
#2608
#2609
#2613
#2619
#2620
#2625
#2640
#2641
#2642
#2643
#2646
#2647
#2650
#2653
#2655
#2656
#2658
#2660
#2664
#2670
#2672
#2675
#2680
#2681
#2682
#2689
#2690
#2691
#2695
#2700
#2701
#2703
#2704
#2705
#2707
#2711
#2721
#2729
#2730
#2733
#2734
#2735
#2736
#2737
#2738
#2750
#2751
#2754
#2763
#2764
#2766
#2771
#2772
#2773
#2774
#2775
#2780
#2782
#2792
#2793
#2795
#2796
#2799
#2801
#2802
#2803
#2805
#2807
#371
#374
#375
#376
#377
#378
#380
#381
#383
#384
#385
#386
#392
#44
#532
#629
#662
#666
#689
#691
#698
#699
#719
#725
#730
#731
#738
#745
#752
#774
#816
#818
#82
#829
#847
#857
#888
#933
#961
#971
#977
#981
0.9.18
0.9.20
0.9.21
0.9.23
0.9.24
0.9.25
0.9.27
0.9.28
0.9.29
0.9.30
0.9.31
0.9.32
0.9.33
0.9.35
0.9.36
0.9.37
0.9.38
0.9.39
0.9.42
0.9.43
0.9.45
0.9.46
0.9.47
0.9.48
0.9.49
0.9.50
0.9.9
BOB
I2CP
SAM
addressbook
api
apps
blocker
build
console
critical
crypto
data
debian
defect
docker
duplicate
easy-install bundle
enhancement
eventually
general
i2psnark
i2ptunnel
infrastructure
installer
jetty
maintenance
major
minor
misc
naming
netdb
not a bug
not our bug
package
profiles
research
router
soon
streaming
susidns
susimail
systray
task
tests
transport
trivial
tunnels
unconfirmed
undecided
update
utils
website
wontfix
works-for-me
wrapper
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
echelon idk zzz
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: I2P_Developers/i2p.i2p#489
No description provided.
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?