Date: Thu, 30 Oct 2014 17:44:18 +0100 From: Enrico Maria Crisostomo <enrico.m.crisostomo@gmail.com> To: Mathieu Arnold <mat@FreeBSD.org> Cc: freebsd-doc@FreeBSD.org, Matthew Seaman <matthew@freebsd.org> Subject: Re: Suggestion about a correction in Porter' HandBook, Chapter 10 Message-ID: <4B0FBD68-B6F7-4C35-955F-EFCA88C3C6BA@gmail.com> In-Reply-To: <D05DEAB77A61D8FB2D1338FC@ogg.in.absolight.net> References: <C318C257-B660-491E-B9E0-1E8602C5747F@gmail.com> <D05DEAB77A61D8FB2D1338FC@ogg.in.absolight.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_1FE6D088-6D6A-4274-A629-601624F11A78
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
charset=us-ascii
Hi Mathieu,
> On 30 Oct 2014, at 17:30, Mathieu Arnold <mat@FreeBSD.org> wrote:
>=20
>=20
>=20
> +--On 30 octobre 2014 12:50:18 +0100 Enrico Maria Crisostomo
> <enrico.m.crisostomo@gmail.com> wrote:
> | Hi all,
> |=20
> | This morning I was notified by Matthew Seaman about a problem in a =
port I
> | maintain and finally we discovered that `svn diff` does **not** =
output
> | information about files that have "history scheduled with commit": =
that
> | is, files which seem to be new files, but in reality are not. The
> | typical case is files "added" as a result of a `svn mv` operation. =
This
> | behaviour led to the problem that affected the port.
> |=20
> | The Porter's Handbook implicitly implies that `svn diff` is =
equivalent to
> | `diff -ruN` but in fact it is not: using `svn diff` may lead to the
> | aforementioned problem. svn 1.7 added the `--show-copies-as-adds` =
option
> | to the `svn diff` command which forces the expected behaviour.
> | Therefore, I suggest Chapter 10, Section 1, "Using Subversion to =
Make
> | Patches" to be amended in order to describe this behaviour.
>=20
> Unless mistaken, the PHB says that if you move files around, you =
*must* say
> so in the PR you open, so that the developper can replicate the =
commands
> before applying the patch.
Indeed, it says so, and I did said so in the PR, adding the full `svn =
st` output showing what was going on.
>=20
> Because if you add --show-copies-as-adds, the diff will be in such a =
way
> that files will get created without its ancestry taken into account, =
which
> we *do not* want.
Good point, that's the show-stopper.
>=20
> The good thing about Subversion is that it has a way to know that foo =
has
> been copied to bar without having to fiddle around in the repository =
doing
> repo-copies like we used to do with CVS...
>=20
> If the PHB is not clear about that (or I just dreamt I read/wrote that =
bit)
> do tell me, I'll fix it :-)
IMHO it's not that clear, but that may be subject to interpretation. =
The relevant bits are these:
Chapter 10:
Please mention any added or deleted files in the message, as they =
have to be explicitly specified to svn(1) when doing a commit.
Chapter 10, Section 10.1:
While in the port directory, make any changes that are needed. If =
adding, moving, or removing a file, use svn to track these changes:
% svn add new_file
% svn move old_name new_name
% svn remove deleted_file
[...snip...]
The last step is to make a unified diff(1) of the changes:
% svn diff > ../`make -VPKGNAME`.diff
Note:=20
Any files that have been removed have to be explicitly mentioned in =
the PR, because file removal may not be obvious to the committer.
As you can see, the first citation talks about added and deleted files, =
but in the context of a manual diff. The second citation, coming from =
the section about Subversion diff, only cites deletions and makes an =
example with the `svn move` command.
In my opinion, we could improve adding the important bits of your =
explanations (citing additions and additions coming from move operations =
and specifying that the committer has to manually perform those =
operations before applying the patch).
In fact, if I followed literally what's written in the PHB to my =
understanding, I'd only cite *deleted* files, and the committer will =
have no information about moved ones (that is what happened to us).
Cheers,
--=20
Enrico
>=20
> Regards,
>=20
> --=20
> Mathieu Arnold
--Apple-Mail=_1FE6D088-6D6A-4274-A629-601624F11A78
Content-Disposition: attachment;
filename=smime.p7s
Content-Type: application/pkcs7-signature;
name=smime.p7s
Content-Transfer-Encoding: base64
MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIMgTCCBjQw
ggQcoAMCAQICAR4wDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0
Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxKTAn
BgNVBAMTIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA3MTAyNDIxMDE1NVoX
DTE3MTAyNDIxMDE1NVowgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSsw
KQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFy
dENvbSBDbGFzcyAxIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQTCCASIwDQYJKoZIhvcN
AQEBBQADggEPADCCAQoCggEBAMcJg8zOLdgasSmkLhOrlr6KMoOMpohBllVHrdRvEg/q6r8jR+EK
75xCGhR8ToREoqe7zM9/UnC6TS2y9UKTpT1v7RSMzR0t6ndl0TWBuUr/UXBhPk+Kmy7bI4yW4urC
+y7P3/1/X7U8ocb8VpH/Clt+4iq7nirMcNh6qJR+xjOhV+VHzQMALuGYn5KZmc1NbJQYclsGkDxD
z2UbFqE2+6vIZoL+jb9x4Pa5gNf1TwSDkOkikZB1xtB4ZqtXThaABSONdfmv/Z1pua3FYxnCFmdr
/+N2JLKutIxMYqQOJebr/f/h5t95m4JgrM3Y/w7YX9d7YAL9jvN4SydHsU6n65cCAwEAAaOCAa0w
ggGpMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRTcu2SnODaywFc
fH6WNU7y1LhRgjAfBgNVHSMEGDAWgBROC+8apEBbpRdphzDKNGhD0EGu8jBmBggrBgEFBQcBAQRa
MFgwJwYIKwYBBQUHMAGGG2h0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9jYTAtBggrBgEFBQcwAoYh
aHR0cDovL3d3dy5zdGFydHNzbC5jb20vc2ZzY2EuY3J0MFsGA1UdHwRUMFIwJ6AloCOGIWh0dHA6
Ly93d3cuc3RhcnRzc2wuY29tL3Nmc2NhLmNybDAnoCWgI4YhaHR0cDovL2NybC5zdGFydHNzbC5j
b20vc2ZzY2EuY3JsMIGABgNVHSAEeTB3MHUGCysGAQQBgbU3AQIBMGYwLgYIKwYBBQUHAgEWImh0
dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cu
c3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwDQYJKoZIhvcNAQEFBQADggIBAAqDCH14qywG
XLhjjF6uHLkjd02hcdh9hrw+VUsv+q1eeQWB21jWj3kJ96AUlPCoEGZ/ynJNScWy6QMVQjbbMXlt
UfO4n4bGGdKo3awPWp61tjAFgraLJgDk+DsSvUD6EowjMTNx25GQgyYJ5RPIzKKR9tQW8gGK+2+R
HxkUCTbYFnL6kl8Ch507rUdPPipJ9CgJFws3kDS3gOS5WFMxcjO5DwKfKSETEPrHh7p5shuuNktv
sv6hxHTLhiMKX893gxdT3XLS9OKmCv87vkINQcNEcIIoFWbP9HORz9v3vQwR4e3ksLc2JZOAFK+s
sS5XMEoznzpihEP0PLc4dCBYjbvSD7kxgDwZ+Aj8Q9PkbvE9sIPP7ON0fz095HdThKjiVJe6vofq
+n6b1NBc8XdrQvBmunwxD5nvtTW4vtN6VY7mUCmxsCieuoBJ9OlqmsVWQvifIYf40dJPZkk9YgGT
zWLpXDSfLSplbY2LL9C9U0ptvjcDjefLTvqSFc7tw1sEhF0n/qpA2r0GpvkLRDmcSwVyPvmjFBGq
Up/pNy8ZuPGQmHwFi2/14+xeSUDG2bwnsYJQG2EdJCB6luQ57GEnTA/yKZSTKI8dDQa8Sd3zfXb1
9mOgSF0bBdXbuKhEpuP9wirslFe6fQ1t5j5R0xi72MZ8ikMu1RQZKCyDbMwazlHiMIIGRTCCBS2g
AwIBAgIDCFuNMA0GCSqGSIb3DQEBCwUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRD
b20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYG
A1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0EwHhcN
MTMxMjExMTUyNzM5WhcNMTQxMjEyMDkyMjAxWjBWMSYwJAYDVQQDDB1lbnJpY28ubS5jcmlzb3N0
b21vQGdtYWlsLmNvbTEsMCoGCSqGSIb3DQEJARYdZW5yaWNvLm0uY3Jpc29zdG9tb0BnbWFpbC5j
b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRT2LNGT66xvt23639dtvMMLt2dDVU
GZCKYOPK3uwl6uxIUsm4P4IPwnE+RMaEFgkGck7fHv/MPlVtJebXmMWv9/XVuahRMRiyp7taw0y7
72wRRqfukQbrHEsuJ+xVkwUTR9vZpM13K0Ity0PvkRmSVlGncG96UBJ4Ye+E/l9jo77j6V44rOGo
BLvHR6wlD0cSccLaN0XhkQLu3Gfd2C/201nUY7E0EBZWSaFLBf9AubRuq4HbQWrgaUf3/sOZH+pG
qoD8/fYGipdVYcUVjh5w4Yc1pBwrVeiluuT8sZ3C28S2x/YWrWwNV7QqpXGSV5Lp6afl43rF42h1
YPOACoRBAgMBAAGjggLjMIIC3zAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHSUEFjAUBggr
BgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFFRCm6UtWNAmeycalMMRIlGuHH6oMB8GA1UdIwQY
MBaAFFNy7ZKc4NrLAVx8fpY1TvLUuFGCMCgGA1UdEQQhMB+BHWVucmljby5tLmNyaXNvc3RvbW9A
Z21haWwuY29tMIIBTAYDVR0gBIIBQzCCAT8wggE7BgsrBgEEAYG1NwECAzCCASowLgYIKwYBBQUH
AgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwgfcGCCsGAQUFBwICMIHqMCcW
IFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRl
IHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1l
bnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRl
bmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlv
bnMuMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL2NydHUxLWNybC5j
cmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNv
bS9zdWIvY2xhc3MxL2NsaWVudC9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5j
b20vY2VydHMvc3ViLmNsYXNzMS5jbGllbnQuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cu
c3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQsFAAOCAQEAv7bVFNp6SmYLMKinPm/y4ZmG2pytnEMh
34tNrVhPqbYF4yAYw3UdlkmU4wS4GUEAbcMTTJWL5jIZ0JwpkVgUdN9VtDlIuZF7evuWB9LAx5re
TAZJ4FR11/Q4AGE4Hs0PvT8i4dvug8IFhx1DLXMA14ypFdcC1+f46uxTJ1//nQTv3wuhdJdarPI5
K5NHzfL+pK+/3Gn7RcfgbAjp2MSEsnV20PmWWLDd+aO+NVW22+YjaOT/c3fnp2NTk3tPm9t7rUkK
xcRHrcFNjurmYIIbWUBJ2XosnxdWVkA7JvIS5wAOsI5RZcYA6/0FqltjCIyZ+YsP+Rs3Mlp8ra3l
7KKN7DGCA28wggNrAgEBMIGUMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMv
U3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0ECAwhbjTAJBgUr
DgMCGgUAoIIBrzAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xNDEw
MzAxNjQ0MTlaMCMGCSqGSIb3DQEJBDEWBBQrMj/3eQCWY9XWNYeF3B3JfQ1+2DCBpQYJKwYBBAGC
NxAEMYGXMIGUMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UE
CxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20g
Q2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0ECAwhbjTCBpwYLKoZIhvcNAQkQ
AgsxgZeggZQwgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQL
EyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBD
bGFzcyAxIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQQIDCFuNMA0GCSqGSIb3DQEBAQUA
BIIBACm3eAN1/t8skGmcC30PfX8EiPnA04sNJK8BRmDnF4SIhkNZTZlI3TA6GdxMuzMrfW9S7rkK
bFveNT61HEn1aGCS+u5qxmh4eiEhOnq4qWaiaunb0gbmVyvtBI1YNF2wb3jbyjOzaWGPRP0tfBmF
OM/eCxjneKhVhbPfs/ZVKloPH/QHBEeJYkj6oArztqmeaIEluKXCu+Scgjmkn6oBmUZz59f/rTZZ
J1TrS7nk/DHC5Cms3q1snF7e42LggLkA8xAxCfC+RPFT5wdCtiTIOsD3o+jMn/6TLxzZez49Dk41
GntdqcXaLEfU8QfO1szJGHxxf64A3ntwOftGcmnfJUsAAAAAAAA=
--Apple-Mail=_1FE6D088-6D6A-4274-A629-601624F11A78--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4B0FBD68-B6F7-4C35-955F-EFCA88C3C6BA>