git: contrib/tnftp: Delete entire contents prior to merge
John Marino
marino at crater.dragonflybsd.org
Wed Nov 4 10:45:20 PST 2015
commit bfc02740ac2d5248ff4f0a4848608db55faed1e4
Author: John Marino <draco at marino.st>
Date: Wed Nov 4 18:22:36 2015 +0100
contrib/tnftp: Delete entire contents prior to merge
Due to a file hierarchy change, merging with the vendor branch will
very difficult. It's easier to wipe everything and resync to the
vendor branch manually (auto-merge will fail everywhere). I've
the local modifications although half of them are cruft from various
upgrades.
Summary of changes:
contrib/tnftp/cmds.c | 2796 -------------------------------------------
contrib/tnftp/cmdtab.c | 307 -----
contrib/tnftp/complete.c | 432 -------
contrib/tnftp/domacro.c | 145 ---
contrib/tnftp/extern.h | 248 ----
contrib/tnftp/fetch.c | 2013 -------------------------------
contrib/tnftp/ftp.1 | 2421 -------------------------------------
contrib/tnftp/ftp.c | 2153 ---------------------------------
contrib/tnftp/ftp_var.h | 355 ------
contrib/tnftp/main.c | 1057 ----------------
contrib/tnftp/progressbar.c | 472 --------
contrib/tnftp/progressbar.h | 92 --
contrib/tnftp/ruserpass.c | 318 -----
contrib/tnftp/ssl.c | 609 ----------
contrib/tnftp/ssl.h | 63 -
contrib/tnftp/util.c | 1542 ------------------------
contrib/tnftp/version.h | 38 -
17 files changed, 15061 deletions(-)
delete mode 100644 contrib/tnftp/cmds.c
delete mode 100644 contrib/tnftp/cmdtab.c
delete mode 100644 contrib/tnftp/complete.c
delete mode 100644 contrib/tnftp/domacro.c
delete mode 100644 contrib/tnftp/extern.h
delete mode 100644 contrib/tnftp/fetch.c
delete mode 100644 contrib/tnftp/ftp.1
delete mode 100644 contrib/tnftp/ftp.c
delete mode 100644 contrib/tnftp/ftp_var.h
delete mode 100644 contrib/tnftp/main.c
delete mode 100644 contrib/tnftp/progressbar.c
delete mode 100644 contrib/tnftp/progressbar.h
delete mode 100644 contrib/tnftp/ruserpass.c
delete mode 100644 contrib/tnftp/ssl.c
delete mode 100644 contrib/tnftp/ssl.h
delete mode 100644 contrib/tnftp/util.c
delete mode 100644 contrib/tnftp/version.h
http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/bfc02740ac2d5248ff4f0a4848608db55faed1e4
--
DragonFly BSD source repository
More information about the Commits
mailing list