THIS BRANCH IS OBSOLETE, PLEASE READ:

mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-30 04:22:44 +00:00
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       10f4a6c225ee83ceae8013937d720abc6d55a42b    3ad46d0783
stable/11       a76e2a369a53c030aca4a52b694102e99aadbb2f    46062cb1a2
stable/12       f262e04c92d7b7a409e91c21a09ea09d54619099    f4d0bc6aa6
releng/10.0     fcf03644270b915aec5f010cd84202ad00ce746d    0099f6f89a
releng/10.1     a5b8a0cee842e12aa090449e042788b9eabc35da    a9b4be2046
releng/10.2     14e67f3152c63dff2a97a5fcd9b3fa03a6625f31    2a34883424
releng/10.3     57fbb64699be1ef57f413a39f3d6920bb192ee7f    8411c9ac24
releng/10.4     976886d4ea    d869f4ade2
releng/11.0     bc72ed658e    8d2708de5d
releng/11.1     d3b778b791f4e4d8afc69698b2097efdf2f79de7    3e9337c6b2
releng/11.2     24e863807ab509af9c38e84b4e5df34ff4fdf9e2    c0d2bc3b03
releng/11.3     b43bbc16b05f1b7e0770ac18bc2be0b3805a994e    9e63140d5a
releng/11.4     9332e027885d3d785a45dfcf3f7bd2f7c8181d0a    4adbf1f668
releng/12.0     58cdccde6ac7b22cc1ca42fbca6460a58304077f    12b769ed36
releng/12.1     c522014dbaadf4b1d7431093f91c52cbf1d3ca62    e30782bbda
releng/12.2     30ef47ef8fb0026951af8501fe30d33f3b4a7090    2120d07af0

--

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.
This commit is contained in:
Ulrich Spörlein
2020-12-30 11:29:55 +01:00
parent 9e4440ca5b 3cc0c0d66a
commit de1aa3dab2
THIS BRANCH IS OBSOLETE, PLEASE READ:

Diff Content Not Available
