Re: [CFT] rewrite of the merge(1) utility

2015-08-14 Thread Slawa Olhovchenkov
On Fri, Aug 14, 2015 at 12:59:30PM -0700, John Baldwin wrote: > > > There are a few ways. Newer installs do bootstrap it for you, so if you > > > follow the traditional source upgrade method you can just run 'etcupdate' > > > in place of 'mergemaster'. If you do not want to have a /usr/src tree,

Re: [CFT] rewrite of the merge(1) utility

2015-08-14 Thread John Baldwin
On Friday, August 14, 2015 10:31:46 PM Slawa Olhovchenkov wrote: > On Fri, Aug 14, 2015 at 10:52:04AM -0700, John Baldwin wrote: > > > On Friday, August 14, 2015 10:39:51 AM Slawa Olhovchenkov wrote: > > > On Fri, Aug 14, 2015 at 12:14:28AM +0300, Slawa Olhovchenkov wrote: > > > > > > > On Thu, A

Re: [CFT] rewrite of the merge(1) utility

2015-08-14 Thread Slawa Olhovchenkov
On Fri, Aug 14, 2015 at 10:52:04AM -0700, John Baldwin wrote: > On Friday, August 14, 2015 10:39:51 AM Slawa Olhovchenkov wrote: > > On Fri, Aug 14, 2015 at 12:14:28AM +0300, Slawa Olhovchenkov wrote: > > > > > On Thu, Aug 13, 2015 at 08:23:02AM -0700, John Baldwin wrote: > > > > > > > On Thursd

Re: [CFT] rewrite of the merge(1) utility

2015-08-14 Thread John Baldwin
On Friday, August 14, 2015 11:19:15 PM Julian Elischer wrote: > On 8/13/15 11:23 PM, John Baldwin wrote: > > On Thursday, August 13, 2015 04:13:43 PM Slawa Olhovchenkov wrote: > >> On Tue, Aug 04, 2015 at 10:00:06PM -0700, John Baldwin wrote: > >> > >>> On Sunday, July 26, 2015 03:26:22 AM Baptiste

Re: [CFT] rewrite of the merge(1) utility

2015-08-14 Thread John Baldwin
On Friday, August 14, 2015 10:39:51 AM Slawa Olhovchenkov wrote: > On Fri, Aug 14, 2015 at 12:14:28AM +0300, Slawa Olhovchenkov wrote: > > > On Thu, Aug 13, 2015 at 08:23:02AM -0700, John Baldwin wrote: > > > > > On Thursday, August 13, 2015 04:13:43 PM Slawa Olhovchenkov wrote: > > > > On Tue, A

Re: [CFT] rewrite of the merge(1) utility

2015-08-14 Thread Slawa Olhovchenkov
On Fri, Aug 14, 2015 at 11:19:15PM +0800, Julian Elischer wrote: > On 8/13/15 11:23 PM, John Baldwin wrote: > > On Thursday, August 13, 2015 04:13:43 PM Slawa Olhovchenkov wrote: > >> On Tue, Aug 04, 2015 at 10:00:06PM -0700, John Baldwin wrote: > >> > >>> On Sunday, July 26, 2015 03:26:22 AM Bapt

Re: [CFT] rewrite of the merge(1) utility

2015-08-14 Thread Julian Elischer
On 8/13/15 11:23 PM, John Baldwin wrote: On Thursday, August 13, 2015 04:13:43 PM Slawa Olhovchenkov wrote: On Tue, Aug 04, 2015 at 10:00:06PM -0700, John Baldwin wrote: On Sunday, July 26, 2015 03:26:22 AM Baptiste Daroussin wrote: Hi all, I was botherd to not have the merge(1) utility avai

Re: [CFT] rewrite of the merge(1) utility

2015-08-14 Thread Slawa Olhovchenkov
On Fri, Aug 14, 2015 at 12:14:28AM +0300, Slawa Olhovchenkov wrote: > On Thu, Aug 13, 2015 at 08:23:02AM -0700, John Baldwin wrote: > > > On Thursday, August 13, 2015 04:13:43 PM Slawa Olhovchenkov wrote: > > > On Tue, Aug 04, 2015 at 10:00:06PM -0700, John Baldwin wrote: > > > > > > > On Sunday

Re: [CFT] rewrite of the merge(1) utility

2015-08-13 Thread Slawa Olhovchenkov
On Thu, Aug 13, 2015 at 08:23:02AM -0700, John Baldwin wrote: > On Thursday, August 13, 2015 04:13:43 PM Slawa Olhovchenkov wrote: > > On Tue, Aug 04, 2015 at 10:00:06PM -0700, John Baldwin wrote: > > > > > On Sunday, July 26, 2015 03:26:22 AM Baptiste Daroussin wrote: > > > > Hi all, > > > > >

Re: [CFT] rewrite of the merge(1) utility

2015-08-13 Thread John Baldwin
On Thursday, August 13, 2015 04:13:43 PM Slawa Olhovchenkov wrote: > On Tue, Aug 04, 2015 at 10:00:06PM -0700, John Baldwin wrote: > > > On Sunday, July 26, 2015 03:26:22 AM Baptiste Daroussin wrote: > > > Hi all, > > > > > > I was botherd to not have the merge(1) utility available in base (for

Re: [CFT] rewrite of the merge(1) utility

2015-08-13 Thread Slawa Olhovchenkov
On Tue, Aug 04, 2015 at 10:00:06PM -0700, John Baldwin wrote: > On Sunday, July 26, 2015 03:26:22 AM Baptiste Daroussin wrote: > > Hi all, > > > > I was botherd to not have the merge(1) utility available in base (for > > etcupdate) > > when building base WITHOUT_RCS. > > > > So I have rewritten

Re: [CFT] rewrite of the merge(1) utility

2015-08-04 Thread John Baldwin
On Sunday, July 26, 2015 03:26:22 AM Baptiste Daroussin wrote: > Hi all, > > I was botherd to not have the merge(1) utility available in base (for > etcupdate) > when building base WITHOUT_RCS. > > So I have rewritten a merge(1) utility which should be compatible. > > I used the 3-way merge cod

[CFT] rewrite of the merge(1) utility

2015-07-25 Thread Baptiste Daroussin
Hi all, I was botherd to not have the merge(1) utility available in base (for etcupdate) when building base WITHOUT_RCS. So I have rewritten a merge(1) utility which should be compatible. I used the 3-way merge code from the fossil VCS instead of making it call diff3. All I have done from the fo