Re: Accidentally aborted upgrade via freebsd-update - how to recover?

2010-12-28 Thread Damien Fleuriot
On 12/28/10 7:20 AM, Jason Helfman wrote: On Mon, Dec 27, 2010 at 04:52:03PM -0800, Doug Barton thus spake: On 12/27/2010 16:40, Damien Fleuriot wrote: On 12/27/10 11:58 PM, Clifton Royston wrote: OK, and oh well... I wish there were some way to automate the diffing out of the

Re: Accidentally aborted upgrade via freebsd-update - how to recover?

2010-12-28 Thread Clifton Royston
On Mon, Dec 27, 2010 at 10:20:28PM -0800, Jason Helfman wrote: On Mon, Dec 27, 2010 at 04:52:03PM -0800, Doug Barton thus spake: On 12/27/2010 16:40, Damien Fleuriot wrote: On 12/27/10 11:58 PM, Clifton Royston wrote: OK, and oh well... I wish there were some way to automate the diffing

Accidentally aborted upgrade via freebsd-update - how to recover?

2010-12-27 Thread Clifton Royston
OK, so I'm a late adopter - up til now I've always upgraded FreeBSD machines from source or picking the update from a CD, but I decided to try freebsd-update to finally get my home machine from 6.4 to 7.1 (and thence hopefully to 8.1). Everything went well up through the merge steps, until I

Re: Accidentally aborted upgrade via freebsd-update - how to recover?

2010-12-27 Thread Jason Helfman
On Mon, Dec 27, 2010 at 12:44:26PM -1000, Clifton Royston thus spake: OK, so I'm a late adopter - up til now I've always upgraded FreeBSD machines from source or picking the update from a CD, but I decided to try freebsd-update to finally get my home machine from 6.4 to 7.1 (and thence

Re: Accidentally aborted upgrade via freebsd-update - how to recover?

2010-12-27 Thread Clifton Royston
On Mon, Dec 27, 2010 at 02:47:53PM -0800, Jason Helfman wrote: Thanks for the prompt response! On Mon, Dec 27, 2010 at 12:44:26PM -1000, Clifton Royston thus spake: ... How can I continue from here without downloading and applying 29000+ patches all over again, not to mention having to

Re: Accidentally aborted upgrade via freebsd-update - how to recover?

2010-12-27 Thread Jason Helfman
On Mon, Dec 27, 2010 at 12:58:28PM -1000, Clifton Royston thus spake: On Mon, Dec 27, 2010 at 02:47:53PM -0800, Jason Helfman wrote: Thanks for the prompt response! Your welcome :) On Mon, Dec 27, 2010 at 12:44:26PM -1000, Clifton Royston thus spake: ... How can I continue from here

Re: Accidentally aborted upgrade via freebsd-update - how to recover?

2010-12-27 Thread Clifton Royston
On Mon, Dec 27, 2010 at 03:02:56PM -0800, Jason Helfman wrote: On Mon, Dec 27, 2010 at 12:58:28PM -1000, Clifton Royston thus spake: On Mon, Dec 27, 2010 at 02:47:53PM -0800, Jason Helfman wrote: On Mon, Dec 27, 2010 at 12:44:26PM -1000, Clifton Royston thus spake: ... How can I continue

Re: Accidentally aborted upgrade via freebsd-update - how to recover?

2010-12-27 Thread Damien Fleuriot
On 12/27/10 11:58 PM, Clifton Royston wrote: OK, and oh well... I wish there were some way to automate the diffing out of the $FreeBSD lines. I suppose those might be the artifact of some previous upgrade, so that the file version present is not the one expected for FreeBSD 6.1.

Re: Accidentally aborted upgrade via freebsd-update - how to recover?

2010-12-27 Thread Doug Barton
On 12/27/2010 16:40, Damien Fleuriot wrote: On 12/27/10 11:58 PM, Clifton Royston wrote: OK, and oh well... I wish there were some way to automate the diffing out of the $FreeBSD lines. I suppose those might be the artifact of some previous upgrade, so that the file version present is

Re: Accidentally aborted upgrade via freebsd-update - how to recover?

2010-12-27 Thread Clifton Royston
On Tue, Dec 28, 2010 at 01:40:26AM +0100, Damien Fleuriot wrote: On 12/27/10 11:58 PM, Clifton Royston wrote: OK, and oh well... I wish there were some way to automate the diffing out of the $FreeBSD lines. I suppose those might be the artifact of some previous upgrade, so that

Re: Accidentally aborted upgrade via freebsd-update - how to recover?

2010-12-27 Thread Jason Helfman
On Mon, Dec 27, 2010 at 04:52:03PM -0800, Doug Barton thus spake: On 12/27/2010 16:40, Damien Fleuriot wrote: On 12/27/10 11:58 PM, Clifton Royston wrote: OK, and oh well... I wish there were some way to automate the diffing out of the $FreeBSD lines. I suppose those might be the