Is freebsd-update braindamaged, or I'm using it wrong?

[Florent Peterschmitt]

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 at 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 :)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 901 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/freebsd-hackers/attachments/20131001/a3c6c5a0/attachment.sig>