Date: Wed, 5 Nov 2014 15:09:00 -0700 (MST) From: Warren Block <wblock@wonkity.com> To: Chris H <bsd-lists@bsdforge.com> Cc: freebsd-stable@freebsd.org, freebsd-questions@freebsd.org, =?ISO-8859-15?Q?Juan_Ram=F3n_Molina_Menor?= <listjm@club-internet.fr> Subject: Re: Status of svnlite(1) in make.conf(5) Message-ID: <alpine.BSF.2.11.1411051505420.70051@wonkity.com> In-Reply-To: <82353c164271e8ec77453393ddfa41b2@ultimatedns.net> References: <545A95DB.1060100@club-internet.fr> <82353c164271e8ec77453393ddfa41b2@ultimatedns.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 5 Nov 2014, Chris H wrote: > On Wed, 05 Nov 2014 22:25:47 +0100 Juan Ramón Molina Menor > <listjm@club-internet.fr> wrote > >> Hi! >> >> Just curious about what it seems an inconsistency with svnlite(1). The >> initial commit (r251886) says that it was included for checking out and >> committing source and cites two make.conf(5) knobs: WITH_SVN (to get >> "svn" instead of "svnlite") and WITHOUT_SVNLITE (in reality, they are in >> src.conf(5)). Nevertheless, the make.conf man page says, in the >> SVN_UPDATE section, that no subversion client is included in the base >> system, and indeed 'make update' does not work by default. >> >> Should I open a PR or it is too much nitpicking? > I think it would be a good idea. I can say for sure that > svnlite(1) comes on, and is installed from the bootonly CD/DVD. > I think it's also worth mentioning that the entries are actually > targeted to the src.conf(5). > You may also want to CC docs@. As I think Warren Block might also > be interested. It's just "doc@", but I'm here also. And agreed, if the information in a man page is not correct, it needs to be fixed. From owner-freebsd-stable@FreeBSD.ORG Wed Nov 5 22:41:02 2014 Return-Path: <owner-freebsd-stable@FreeBSD.ORG> Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E012645 for <freebsd-stable@freebsd.org>; Wed, 5 Nov 2014 22:41:02 +0000 (UTC) Received: from system.jails.se (system.jails.se [91.205.63.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 29D0A29A for <freebsd-stable@freebsd.org>; Wed, 5 Nov 2014 22:41:00 +0000 (UTC) Received: from localhost (system.jails.se [91.205.63.85]) by system.jails.se (Postfix) with SMTP id 858BA1B9B68 for <freebsd-stable@freebsd.org>; Wed, 5 Nov 2014 23:40:51 +0100 (CET) Received: from klein.pean.org (klein.pean.org [IPv6:2001:16d8:ff9f::60]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by system.jails.se (Postfix) with ESMTPSA id 70F341B9B64; Wed, 5 Nov 2014 23:40:50 +0100 (CET) Content-Type: multipart/signed; boundary="Apple-Mail=_678FB9FF-7EFE-45B2-9668-EDFB8B0C2222"; protocol="application/pkcs7-signature"; micalg=sha1 Mime-Version: 1.0 (Mac OS X Mail 8.1 \(1993\)) Subject: Re: freebsd-udapte upgrade. From: =?utf-8?Q?Peter_Ankerst=C3=A5l?= <peter@pean.org> In-Reply-To: <2B820BFF-8565-4A4D-B05E-3A66E8939A52@gromit.dlib.vt.edu> Date: Wed, 5 Nov 2014 23:40:42 +0100 Message-Id: <2DE7E247-63F1-4A3E-AE25-46E1207BB0A8@pean.org> References: <545A348A.4000908@pean.org> <CACdU+f-vY2DL=2mHGgU7Lggv2zxrhTji4Aoddrh3L=TAvOC-OA@mail.gmail.com> <BD86DB4D-1718-4E3F-9F4A-6B3531ED8FBA@pean.org> <2B820BFF-8565-4A4D-B05E-3A66E8939A52@gromit.dlib.vt.edu> To: Paul Mather <paul@gromit.dlib.vt.edu> X-Mailer: Apple Mail (2.1993) X-DSPAM-Result: Innocent X-DSPAM-Processed: Wed Nov 5 23:40:51 2014 X-DSPAM-Confidence: 1.0000 X-DSPAM-Probability: 0.0023 X-DSPAM-Signature: 545aa77364467249211857 X-DSPAM-Factors: 27, freebsd+update+#+without+>>>>, 0.40000, Mime-Version*X+#+8.1, 0.40000, current+#+and, 0.40000, it+#+#+#+contents, 0.40000, Scot+Hetzel+#+gmail+com>, 0.40000, Most+#+what+happened+is, 0.40000, then+supposed+#+resolved+the, 0.40000, only+I, 0.40000, file+presented+You, 0.40000, in+>>>>+#+places+I, 0.40000, wrote+#+#+On+Wed, 0.40000, AM+Peter, 0.40000, so+#+not+had, 0.40000, presented, 0.40000, be+#+that+#+should, 0.40000, be+resolved+#+it, 0.40000, >>>>+#+someone+please, 0.40000, Paul+#+#+#+dlib, 0.40000, basically+be+invalid+>+>, 0.40000, supposed+#+#+the, 0.40000, >>>>+#+really+don't+understand, 0.40000, update+#+#+>>>>, 0.40000, the+#+#+your+current, 0.40000, pean+org>+wrote+#+Could, 0.40000, right, 0.40000, corrupt+your+setup+completely, 0.40000, 8+#+#+Peter+Ankerst%c3%a5l, 0.40000 Cc: Scot Hetzel <swhetzel@gmail.com>, FreeBSD Stable <freebsd-stable@freebsd.org> X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-stable>, <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable/>; List-Post: <mailto:freebsd-stable@freebsd.org> List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>, <mailto:freebsd-stable-request@freebsd.org?subject=subscribe> X-List-Received-Date: Wed, 05 Nov 2014 22:41:02 -0000 --Apple-Mail=_678FB9FF-7EFE-45B2-9668-EDFB8B0C2222 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On 05 Nov 2014, at 20:29, Paul Mather <paul@gromit.dlib.vt.edu> wrote: >=20 >=20 >> On Nov 5, 2014, at 1:58 PM, Peter Ankerst=C3=A5l <peter@pean.org> = wrote: >>=20 >>=20 >>=20 >>>> On 5 nov 2014, at 19:53, Scot Hetzel <swhetzel@gmail.com> wrote: >>>>=20 >>>> On Wed, Nov 5, 2014 at 8:30 AM, Peter Ankerst=C3=A5l = <peter@pean.org> wrote: >>>> Could someone please explain how to use freebsd-update upgrade = without >>>> destroying all of your configuration files? >>>>=20 >>>> I really don't understand how to use the merge function.. In this = case i >>>> typed :q for all files it asked about. :wq seem to >>>> do about the same thing. Notice that a few of the files has this = shit in >>>> multiple places. I can't be right that I should edit every file = manually and >>>> look for "current version" and so on? >>> Most likely what happened is that when you used :wq it wrote the >>> contents of the diff between your current version and the new = version >>> to your existing configuration files. If you had stuck to using :q, >>> it should have left your existing configuration files alone. >>=20 >> This was done with :q only. I dont get it. >=20 > When you upgrade using freebsd-update, it will try and update = configuration files automatically. If there are any configuration files = whose differences can't be resolved automatically, it will present that = file for editing with the merge conflicts in the file presented. You = are then supposed to resolved the conflicts manually. >=20 > I've always resolved any conflicts, so I've not had any experience if = you simply ":q" from the editor, thereby leaving in all the conflict = markers. If freebsd-update doesn't check for unresolved conflicts and = force you to edit the file again, I presume your configuration file will = now basically be invalid. >=20 > Maybe this is what happened in your case? >=20 > Cheers, >=20 > Paul. But its too easy to corrupt your setup completely. This is much worse = than mergemaster. And I haven=E2=80=99t seen any instructions on this in = the handbook. --Apple-Mail=_678FB9FF-7EFE-45B2-9668-EDFB8B0C2222 Content-Disposition: attachment; filename=smime.p7s Content-Type: application/pkcs7-signature; name=smime.p7s Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIMbzCCBjMw ggUboAMCAQICAwiyiDANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0 YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcx ODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xpZW50IENB MB4XDTE0MDEyMDA3NTIzOFoXDTE1MDEyMTA4NTkyMVowUzEZMBcGA1UEDRMQMWlGRkxHbTV3RmVT WjZ6OTEXMBUGA1UEAwwOcGV0ZXJAcGVhbi5vcmcxHTAbBgkqhkiG9w0BCQEWDnBldGVyQHBlYW4u b3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzoKHiOE9vdQgax/GZyTaqtNvfjGI HwG1tsMOXZELs49KJY66oD//szW3yoIl8nQapUBn+hZqs3QT5PxqfElXxljYszYE6yk3kWR7EVtl IEfT7Pf24XlFw4uzoZzEjaxPJBt4+BWwb1MpqBmwTNZwZGYI9SO6JW23G9o+e+hPmlXFTovW9B36 J0M2Qu0+IE6MsDIG0y5CwuiXMqNz+vEBiIBvdef3CIidRn3/K7DQYBYn9gj/UNB1yf1GRhsNDO12 4T9+9bhlplov0srt7pqQjaSiiqVOCCWdpxvM/eF0LFBkEFATy45RKtl2vk9zM1wmI+sU29vodHoD Duf8t4bTtQIDAQABo4IC1DCCAtAwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0lBBYwFAYI KwYBBQUHAwIGCCsGAQUFBwMEMB0GA1UdDgQWBBSAhVDjVwheLV39/7XFsz9rQP0sVDAfBgNVHSME GDAWgBRTcu2SnODaywFcfH6WNU7y1LhRgjAZBgNVHREEEjAQgQ5wZXRlckBwZWFuLm9yZzCCAUwG A1UdIASCAUMwggE/MIIBOwYLKwYBBAGBtTcBAgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3 LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0 aWZpY2F0aW9uIEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFj Y29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3Rh cnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBp biBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA2BgNVHR8ELzAt MCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnR1MS1jcmwuY3JsMIGOBggrBgEFBQcB AQSBgTB/MDkGCCsGAQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9j bGllbnQvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1Yi5j bGFzczEuY2xpZW50LmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS8w DQYJKoZIhvcNAQEFBQADggEBAFiVjpZEkQoHYAtb0E6MVJgzo1K6d6eEjLsCNbaw833a0jws4Rh0 KG/MjqjJzUwa2G6mVZb/JaodRK8VENnpxJ8WhjWqyQL8/lKnGa88XYMtl+i4ICur08IfQLG7zNFn yG/kOAiMNkgF4H6lZx/ezup9fowUOt0hxERXMcqo4p+RzPShx35EGRv+5gZNQ7XW4s2rzFzt9CHa Dar8SyAGHK3oFapKpHsVSUYik0QCLwnGcaHEHNUkCp1YMsjKwvmxVtQQs/2WfsqQlult8UYe0bTr nwDyLbgJDbvp9R5mZDrkUcXYlgP+mAmzTOrT1JhHbyYQjbbxJAmqkAIDcwVyDRAwggY0MIIEHKAD AgECAgEeMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBM dGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMSkwJwYDVQQD EyBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNzEwMjQyMTAxNTVaFw0xNzEw MjQyMTAxNTVaMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UE CxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20g Q2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0EwggEiMA0GCSqGSIb3DQEBAQUA A4IBDwAwggEKAoIBAQDHCYPMzi3YGrEppC4Tq5a+ijKDjKaIQZZVR63UbxIP6uq/I0fhCu+cQhoU fE6ERKKnu8zPf1Jwuk0tsvVCk6U9b+0UjM0dLep3ZdE1gblK/1FwYT5Pipsu2yOMluLqwvsuz9/9 f1+1PKHG/FaR/wpbfuIqu54qzHDYeqiUfsYzoVflR80DAC7hmJ+SmZnNTWyUGHJbBpA8Q89lGxah NvuryGaC/o2/ceD2uYDX9U8Eg5DpIpGQdcbQeGarV04WgAUjjXX5r/2dabmtxWMZwhZna//jdiSy rrSMTGKkDiXm6/3/4ebfeZuCYKzN2P8O2F/Xe2AC/Y7zeEsnR7FOp+uXAgMBAAGjggGtMIIBqTAP BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUU3Ltkpzg2ssBXHx+ljVO 8tS4UYIwHwYDVR0jBBgwFoAUTgvvGqRAW6UXaYcwyjRoQ9BBrvIwZgYIKwYBBQUHAQEEWjBYMCcG CCsGAQUFBzABhhtodHRwOi8vb2NzcC5zdGFydHNzbC5jb20vY2EwLQYIKwYBBQUHMAKGIWh0dHA6 Ly93d3cuc3RhcnRzc2wuY29tL3Nmc2NhLmNydDBbBgNVHR8EVDBSMCegJaAjhiFodHRwOi8vd3d3 LnN0YXJ0c3NsLmNvbS9zZnNjYS5jcmwwJ6AloCOGIWh0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL3Nm c2NhLmNybDCBgAYDVR0gBHkwdzB1BgsrBgEEAYG1NwECATBmMC4GCCsGAQUFBwIBFiJodHRwOi8v d3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnN0YXJ0 c3NsLmNvbS9pbnRlcm1lZGlhdGUucGRmMA0GCSqGSIb3DQEBBQUAA4ICAQAKgwh9eKssBly4Y4xe rhy5I3dNoXHYfYa8PlVLL/qtXnkFgdtY1o95CfegFJTwqBBmf8pyTUnFsukDFUI22zF5bVHzuJ+G xhnSqN2sD1qetbYwBYK2iyYA5Pg7Er1A+hKMIzEzcduRkIMmCeUTyMyikfbUFvIBivtvkR8ZFAk2 2BZy+pJfAoedO61HTz4qSfQoCRcLN5A0t4DkuVhTMXIzuQ8CnykhExD6x4e6ebIbrjZLb7L+ocR0 y4YjCl/Pd4MXU91y0vTipgr/O75CDUHDRHCCKBVmz/Rzkc/b970MEeHt5LC3NiWTgBSvrLEuVzBK M586YoRD9Dy3OHQgWI270g+5MYA8GfgI/EPT5G7xPbCDz+zjdH89PeR3U4So4lSXur6H6vp+m9TQ XPF3a0LwZrp8MQ+Z77U1uL7TelWO5lApsbAonrqASfTpaprFVkL4nyGH+NHST2ZJPWIBk81i6Vw0 ny0qZW2Niy/QvVNKbb43A43ny076khXO7cNbBIRdJ/6qQNq9Bqb5C0Q5nEsFcj75oxQRqlKf6Tcv GbjxkJh8BYtv9ePsXklAxtm8J7GCUBthHSQgepbkOexhJ0wP8imUkyiPHQ0GvEnd83129fZjoEhd GwXV27ioRKbj/cIq7JRXun0NbeY+UdMYu9jGfIpDLtUUGSgsg2zMGs5R4jGCA28wggNrAgEBMIGU MIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJl IERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQ cmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0ECAwiyiDAJBgUrDgMCGgUAoIIBrzAYBgkqhkiG 9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xNDExMDUyMjQwNDlaMCMGCSqGSIb3 DQEJBDEWBBSMloEY/FO17UGe8i8Bo3dFLT/TwjCBpQYJKwYBBAGCNxAEMYGXMIGUMIGMMQswCQYD VQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg Q2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IElu dGVybWVkaWF0ZSBDbGllbnQgQ0ECAwiyiDCBpwYLKoZIhvcNAQkQAgsxgZeggZQwgYwxCzAJBgNV BAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBD ZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAxIFByaW1hcnkgSW50 ZXJtZWRpYXRlIENsaWVudCBDQQIDCLKIMA0GCSqGSIb3DQEBAQUABIIBAEqAn6yoBNijZPOU7nNh 4kZf3hwNwvGoqiB7d5eBedqxEFJYpJJLzgLAioDJS74z76I+EnAIyR+Nimi7Ub/R4H0Tsb0uoc1U e/zFPjqxOf7x5s3HrcOIotCQv6Je/K0FwJn1jDhplrEdS9lhOImkr79c1xI3mjP9cBH8rKJ1iNth nA1qCsgALQgLgFklZ4VDxLENKuPiT4ExbdsHC7RwQWWQrHKN5uwZMRWCyrmaVFqD6vy4FPKMZ5FH O1mpP8F+dK5fPicw7qrmEVuzyhuSaX06HFdmRYOyGvwe08K2nR232ncGEWwtqtYvK9Ik4DDpyMU3 wPgRLW6gBqgyNuMDMxQAAAAAAAA= --Apple-Mail=_678FB9FF-7EFE-45B2-9668-EDFB8B0C2222--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.11.1411051505420.70051>