svn commit: r275551 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor-sys/illumos/dist/uts/common/fs/zfs/sys vendor/illumos/dist/cmd/zdb

[Xin Li]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

On 12/10/14 12:29, Justin T. Gibbs wrote:
> What’s the policy for the commit log on vendor imports from
> illumos? Since illumos does not allow “FreeBSD style” commit
> messages, I’ve been putting that data into the corresponding
> illumos issue that I create.  So this information isn’t lost during
> the merge to FreeBSD, I think we should pull the issue data into
> our commit messages in addition to data taken from the git commit
> in illumos-gate.
> 
> One minor gripe about the illumos issue tracker is that I’ve found
> it hard to keep it from mangling the formatting of text.  For
> example, look at the commit log I put into the history section of 
> https://www.illumos.org/issues/5314.  Instead of fighting with
> that, I’ve been pushing my “FreeBSD commit log” as the description
> of the review associated with the bug and just linking the issue to
> the review.  You can see that in the next big change from Spectra
> that is currently going through the review process:
> 
> https://www.illumos.org/issues/5056 
> https://reviews.csiden.org/r/131/

I think we traditionally do imports as-is, including the commit
message, to vendor[-sys]/ area.  This is mainly to make future
cross-referencing easy, i.e. what does that "MFV 275551" reference to
an Illumos commit?  Should Illumos change to a different SCM in the
future, we will still be able to find the commit by looking up the
commit logs of theirs.

However when merging to head/ we should use FreeBSD style commit (i.e.
your commit messages) to give more information about the change.
Normally we will reference the vendor import revision and Illumos
ticket as well.

Cheers,
- -- 
Xin LI <delphij at delphij.net>    https://www.delphij.net/
FreeBSD - The Power to Serve!           Live free or die
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.1.0 (FreeBSD)

iQIcBAEBCgAGBQJUiLNqAAoJEJW2GBstM+nsJVcP/j3vDqLb+NV0RYYoUzFUnz7z
muU/HIECPo/3vt1ujUX6MROFYWLIotgEtpVFmHgXVqzus3q4qSI2bMrXjSzD0Gze
X9d8uTzlg5W62/1FiREK7BTFewggoCKTvySfJlQ0gw+d03mcNVCESIRhdCRz8c1v
aYYZv684z0k2BpSPfNFbFe2r/xOTDcVviRT36msRaRGjH//uQRs9itP7mZBGjwxi
BlcEJ1U+y/h0SpDex48rNG9ItxpZfrUZA3lsvhqJNOFn9cEwvyVQadueTBBQTCLh
tjN2yqRraZ+eYKjDx1+mVXzzq84GTYnAZQzAHqDzffwASG7rovY4UFwcCvOErSwK
uUSXTe8H94iWWNkD/YCXfyAxQH3GLdfwvwtJ0EtRhu/U4LCd+9gakvxASfOB16Q7
VF08okZzsviP5MqyJh5npr0G+5DLKLNFj2uoL+cqRd8u7C6//taywb6yofsneWkC
d8iLHZVl52XuhO0KBcQUMMv8oX99y5pXrkpo6aeQ5eELiCuBm6aYo/fCxJ13EIxd
ld5Rfk01aq1LJhFS7LWMIUpY2D1HGqTwaE/l0zmdTvIN74DVJIllGy5oKRtRoQEN
VRGWGBl541cs7I1FxGaFyjY3UT38a2MjM3OdkzA/E+cOjrCagTc/Lr5BuJjEgz08
HxI5axE2CuSTP1xrFgl7
=iadt
-----END PGP SIGNATURE-----