Date: Tue, 01 Oct 2013 11:33:40 +0200 From: Florent Peterschmitt <florent@peterschmitt.fr> To: Ivan Voras <ivoras@freebsd.org>, freebsd-hackers <freebsd-hackers@freebsd.org> Subject: Re: Is freebsd-update braindamaged, or I'm using it wrong? Message-ID: <524A96F4.9060400@peterschmitt.fr> In-Reply-To: <CAF-QHFUjfsepwuGnBAhL6x=HYznPj3Cj%2B6fX_O36s8U6C7b7Nw@mail.gmail.com> References: <CAF-QHFUjfsepwuGnBAhL6x=HYznPj3Cj%2B6fX_O36s8U6C7b7Nw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] Le 01/10/2013 11:16, Ivan Voras a écrit : > This is fairly ridiculous. Then, at a random file it has proposed its > own merge and asked the prompt "Does this look reasonable?". It was > not, but when I answered it with "n" it stopped the whole process > (instead of maybe opening the file in the editor for me to merge > again). You can merge files from freebsd-update, using (m) if I remember well. Then you choose right or left for each step. But there is something strange since you have hundreds of conflicts… Did you built each release from sources? -- Florent Peterschmitt | Please: florent@peterschmitt.fr | * Avoid HTML/RTF in E-mail. +33 (0)6 64 33 97 92 | * Send PDF for documents. http://florent.peterschmitt.fr | * Trim your quotations. Really. Proudly powered by Open Source | Thank you :) [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSSpb0AAoJEFr01BkajbiBhIIP/R4oLR708Ip0fmvG4XIdfXrF /FUrP4qPUJxJAdGc+Y1fWvmWTTELdqHn1JqwYLb7oRaFGWmrYb4UKtVrACi9zgkh Emr8kzLkLL9iuXZMtzvBXS3HT/1tRSUDV5PtQ7+0IfKkJUxscDHxubOObJ3+qIKC dVPIYpXHyeJZk1W9XB1dFiT+WNLGYC6Dl/WNb3UkxjP3GzG6VI201rB1vL942zJv wKJR3z2/ZbCQj+77ijaLLVNaS84hOGRwBBXOQdfVFkVtM18eY4OYZrSi4xSde7VB otwwNjYqEwfIFp2bAcxTBNvXJ5tQOk1wW0l7+XhVC5ErPvsYtk8VdUCCz5rEX1OD N1Z207JTBgAkEhfmCy4iEoJF517DpgBGAisI6v0lMpiPZRwLk89YnRh5iTVYKIXS ooevjkQmrIYOx6MzAicvE+irIO7DizrDa264+6JhBL//m0QLDxoZvhBOTkxHCaUw pllhGp9QZhJbFYkLrxecwbSosU0Imn6m93diSmfQr6l7tU0Hwu3qTcnc2Q+v2tdC KxyhwCdFl3u2NESeEaXXNoAdP/cJRx4n2l75+hjOgecEz5DEF+XuT3+o59Q4CS3A tLHFS8qCoy0GTQdVgrUjgDgYth761m9075/RxI/HFjXs+FmiFDCd7696D2Z0Eo4W e5ZnNAxK+diCDh66/EbL =gjnY -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?524A96F4.9060400>