No description
  • C 64%
  • C++ 23%
  • Roff 5%
  • Shell 2.5%
  • Makefile 1.5%
  • Other 3.4%
Find a file
Ulrich Spörlein de1aa3dab2 THIS BRANCH IS OBSOLETE, PLEASE READ:
Dear all,
the FreeBSD project has switched their source of truth repository from
Subversion to Git on 2020-12-23. The previously published commit hashes
were missing required merge commits and were thus unsuitable to be the
basis of the source of truth repository.

They had to be changed (aka "force pushed"). We're sorry for the
inconvenience this causes.

The `master` branch will no longer see any updates and we will push to
`main` going forward. The `stable/X` and `releng/X` branches will see a
force-push directly.

To transplant your work, it is recommended to head over to the wiki at
https://github.com/freebsd/git_conv/wiki for instructions on how to
rebase or remerge your in-flight work. A short outline will be provided
below.

Please note that the actual git "trees" are of course identical between
the old and new conversions, so it's relatively easy to craft git
commits that merge or rebase the work w/o any merge conflicts. Please
reach out to git@FreeBSD.org or file an issue under
https://github.com/freebsd/git_conv/issues if you need assistance.

The mapping of the old to new commit hashes (for the same tree) are
given below. We have archived a copy of the legacy repo under
https://github.com/freebsd/freebsd-legacy which you can add as a remote
to always have a reference to the old `master` or `stable/X` branches
and names.

This is a merge commit that brings both histories together, giving you
common history ancestors, which should help with later merging.
You should be able to cleanly merge into this "legacy" master, and then
merge into "main" following from that. All the following commands assume
you've checked out your own workbranch.

-- Merge from master to main --

$ git remote add freebsd-legacy https://github.com/freebsd/freebsd-legacy.git
$ git fetch --all
$ git merge freebsd-legacy/master  (this convenience commit)
$ git merge origin/main

-- Merge for stable/X or releng/Y branches --

$ git remote add freebsd-legacy https://github.com/freebsd/freebsd-legacy.git
$ git fetch --all
$ git merge freebsd-legacy/stable/X  (to get to the legacy hashes from below)
$ git merge -s ours --allow-unrelated-histories <new-hash-from-below> (this is guaranteed conflict free)
$ git merge origin/stable/X

PLEASE NOTE: You'll end up with twice the history and git log output
will show old history twice and will likely confuse you. Please make an
effort to migrate your work over to a fresh branch based off of main.
A git replace --graft can be used to at least patch up git log output.

-- Rebase your work --

Only for folks that always rebase their local work on top of an origin
branch.

$ git remote add freebsd-legacy https://github.com/freebsd/freebsd-legacy.git
$ git fetch --all
$ git branch -u freebsd-legacy/master
$ git rebase --onto origin/main <your_rebased_work_branch>

-- Old to new hash mappings --

   BRANCH                    LEGACY HASH                                    NEW HASH
master / main   9e4440ca5b    3cc0c0d66a
stable/10       10f4a6c225    3ad46d07830bba44c479e2d19ce376212e52e9af
stable/11       a76e2a369a    46062cb1a2d980ab8fc52a36a418bb44c06fe95f
stable/12       f262e04c92    f4d0bc6aa6b90cbb0ea6cb993d9a10e36f5f4a4c
releng/10.0     fcf0364427    0099f6f89a1325dc504096aecbdcbddad498310e
releng/10.1     a5b8a0cee8    a9b4be204689211fddaab97ddd6df73b8f44d222
releng/10.2     14e67f3152    2a3488342441b3296995c8a9eca705a468d0eff0
releng/10.3     57fbb64699    8411c9ac24aabdbbde468778b35da58dc3c15178
releng/10.4     976886d4ea    d869f4ade283f4691dc249e435376a5883824be2
releng/11.0     bc72ed658e    8d2708de5d6112a492744d367cfdfb8fd219227a
releng/11.1     d3b778b791    3e9337c6b211e778829ed3af783cd41447a8721b
releng/11.2     24e863807a    c0d2bc3b0336fb6825302f44adabff0893d25aed
releng/11.3     b43bbc16b0    9e63140d5a00c9d691d88c5a650c2f74a63105ff
releng/11.4     9332e02788    4adbf1f6686ffdc4c0555a018e14ec63b5981534
releng/12.0     58cdccde6a    12b769ed36a115da3b5013c92cdf294a3a5de98d
releng/12.1     c522014dba    e30782bbdad59b00537d9c44c17e3fb5b3cec95b
releng/12.2     30ef47ef8f    2120d07af09cb830873554ba5405c5d3e51b41cc

--

Again, we're sorry for the inconvenience, please reach out via GitHub
issues and the mailing list to get further help in transplanting your
work onto the one true, canonical, source of truth.

Good luck in 2021!
Ulrich Spörlein, on behalf of the FreeBSD Git working group.
2020-12-30 11:29:55 +01:00
.github/workflows
bin Remove unused headers. 2020-12-12 02:26:43 +00:00
cddl
contrib Fix abort in jemalloc extent coalescing. 2020-12-18 10:09:21 +00:00
crypto Merge OpenSSL 1.1.1i. 2020-12-09 02:05:14 +00:00
etc Missed adding netgraph to mtree in r368443: 2020-12-08 17:44:34 +00:00
gnu Remove additional GDB leftovers missed in r368667 2020-12-15 18:12:03 +00:00
include Change POSIX compliance level for visibility of strerror_l(3). 2020-12-17 17:08:25 +00:00
kerberos5
lib libc: Fix most issues reported by mandoc 2020-12-19 14:54:28 +00:00
libexec rtld-elf: link udivmoddi4 from compiler_rt 2020-12-19 08:38:31 +00:00
release riscv: increase GENERICSD gap 2020-12-16 20:21:56 +00:00
rescue
sbin ipfw(8): Fix a few mandoc related issues 2020-12-19 12:47:40 +00:00
secure caroot: update bundle 2020-12-11 18:14:43 +00:00
share Filter TCP connections to SO_REUSEPORT_LB listen sockets by NUMA domain 2020-12-19 22:04:46 +00:00
stand lualoader: fix lua-lint run 2020-12-17 18:29:30 +00:00
sys Filter TCP connections to SO_REUSEPORT_LB listen sockets by NUMA domain 2020-12-19 22:04:46 +00:00
targets
tests net tests: Re-enable most if_clone tests 2020-12-17 21:54:25 +00:00
tools tools/tools/locale: fix static-colldef 2020-12-18 08:43:06 +00:00
usr.bin patch(1): Fix a few mandoc related issues 2020-12-19 13:00:17 +00:00
usr.sbin trim(8): Fix a few issues reported by mandoc 2020-12-19 13:56:19 +00:00
.arcconfig
.arclint
.cirrus.yml
.clang-format
.gitattributes
.gitignore
COPYRIGHT
LOCKS
MAINTAINERS
Makefile
Makefile.inc1 Remove additional GDB leftovers missed in r368667 2020-12-15 18:12:03 +00:00
Makefile.libcompat
Makefile.sys.inc
ObsoleteFiles.inc Retire obsolete GDB 6.1.1 2020-12-15 17:44:19 +00:00
README Mark the repository as being converted to Git. 2020-12-20 02:59:44 +00:00
README.md Mark the repository as being converted to Git. 2020-12-20 02:59:44 +00:00
RELNOTES Add relnote for r368667, GDB 6.1.1 removal 2020-12-15 17:52:04 +00:00
UPDATING /etc/services: attempt to bring the database to this century 2/2. 2020-12-17 02:54:32 +00:00

This repository is being converted from Subversion to Git.

FreeBSD Source:

This is the top level of the FreeBSD source directory. This file was last revised on: FreeBSD

FreeBSD is an operating system used to power modern servers, desktops, and embedded platforms. A large community has continually developed it for more than thirty years. Its advanced networking, security, and storage features have made FreeBSD the platform of choice for many of the busiest web sites and most pervasive embedded networking and storage devices.

For copyright information, please see the file COPYRIGHT in this directory. Additional copyright information also exists for some sources in this tree - please see the specific source directories for more information.

The Makefile in this directory supports a number of targets for building components (or all) of the FreeBSD source tree. See build(7), config(8), https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html, and https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html for more information, including setting make(1) variables.

Source Roadmap:

bin		System/user commands.

cddl		Various commands and libraries under the Common Development
		and Distribution License.

contrib		Packages contributed by 3rd parties.

crypto		Cryptography stuff (see crypto/README).

etc		Template files for /etc.

gnu		Various commands and libraries under the GNU Public License.
		Please see gnu/COPYING* for more information.

include		System include files.

kerberos5	Kerberos5 (Heimdal) package.

lib		System libraries.

libexec		System daemons.

release		Release building Makefile & associated tools.

rescue		Build system for statically linked /rescue utilities.

sbin		System commands.

secure		Cryptographic libraries and commands.

share		Shared resources.

stand		Boot loader sources.

sys		Kernel sources.

sys/<arch>/conf Kernel configuration files. GENERIC is the configuration
		used in release builds. NOTES contains documentation of
		all possible entries.

tests		Regression tests which can be run by Kyua.  See tests/README
		for additional information.

tools		Utilities for regression testing and miscellaneous tasks.

usr.bin		User commands.

usr.sbin	System administration commands.

For information on synchronizing your source tree with one or more of the FreeBSD Project's development branches, please see:

https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html