In <5227567289602393.wa.paulgboulderaim@listserv.ua.edu>, on
04/12/2013
at 01:48 AM, Paul Gilmartin said:
>Sam said diff3 _allows_ a 3 way merge, which is correct, not that it
>_performs_ a 3-way merge, which you appear to be imputing to him
A normal reading of "diff3 allows a 3 way merge
On Thu, 11 Apr 2013 22:17:31 -0400, Shmuel Metz (Seymour J.) wrote:
> on 04/10/2013 at 08:27 AM, Paul Gilmartin said:
>
>>On Wed, 10 Apr 2013 08:52:55 -0400, Shmuel Metz (Seymour J.) wrote:
>
>on 04/07/2013 at 04:57 PM, Sam Siegel said:
>
>>diff3 allows a 3 way merge between the or
In <8635543010896767.wa.paulgboulderaim@listserv.ua.edu>, on
04/10/2013
at 08:27 AM, Paul Gilmartin said:
>On Wed, 10 Apr 2013 08:52:55 -0400, Shmuel Metz (Seymour J.) wrote:
on 04/07/2013 at 04:57 PM, Sam Siegel said:
>diff3 allows a 3 way merge between the original source
On Wed, 10 Apr 2013 08:52:55 -0400, Shmuel Metz (Seymour J.) wrote:
>>>on 04/07/2013 at 04:57 PM, Sam Siegel said:
>>>
diff3 allows a 3 way merge between the original source and 2
different updates to the original source.
>>>
>>>No; it merges two updates.
>>>
>>ksh:1+ man diff3
>>Reforma
In <6384885757679699.wa.paulgboulderaim@listserv.ua.edu>, on
04/09/2013
at 06:33 PM, Paul Gilmartin said:
>On Tue, 9 Apr 2013 19:24:53 -0400, Shmuel Metz (Seymour J.) wrote: >
>>on 04/07/2013 at 04:57 PM, Sam Siegel said:
>>
>>>diff3 allows a 3 way merge between the original source and 2
On Tue, 9 Apr 2013 19:24:53 -0400, Shmuel Metz (Seymour J.) wrote:
>
>on 04/07/2013 at 04:57 PM, Sam Siegel said:
>
>>diff3 allows a 3 way merge between the original source and 2
>>different updates to the original source.
>
>No; it merges two updates.
>
ksh:1+ man diff3
Reformatting page. Please
In
,
on 04/07/2013
at 04:57 PM, Sam Siegel said:
>Patch is the unix version of SUPERC that shows the delta between
>source files.
ITYM diff; the patch utility applies an update.
>diff3 allows a 3 way merge between the original source and 2
>different updates to the original source.
No; it
On Mon, 8 Apr 2013 05:49:58 -0700, Phil Smith wrote:
>
>In addition, I suspect/believe that update-by-replacement encourages more
>changes than necessary: that is, for 30 years, when I've made a change using
>XEDIT in UPDATE mode, I've ALWAYS looked at the resulting update before
>committing it,
+1 for CMS UPDATE, 45+ years old and going strong.
I've been irritated by the update-by-replacement theology since I first
encountered it. The ability to easily look and see what lines were hit by an
update without having to re-run diffs (which takes a long time, relatively
speaking, especially
On Sun, 7 Apr 2013 22:27:15 -0400, Tony Harminc wrote:
>On 7 April 2013 20:19, Paul Gilmartin wrote:
>
>> Slight correction. The UNIX "version of SUPERC" is "diff". (I suspect
>> they use similar algorithms.)
>
>Not so similar, as you pointed out back in January:
>
>>On 8 January 2013 15:02, Pa
On 7 April 2013 20:19, Paul Gilmartin wrote:
> Slight correction. The UNIX "version of SUPERC" is "diff". (I suspect
> they use similar algorithms.)
Not so similar, as you pointed out back in January:
>On 8 January 2013 15:02, Paul Gilmartin wrote:
>That's somewhat old technology. If from
On Sun, Apr 7, 2013 at 5:19 PM, Paul Gilmartin wrote:
> On Sun, 7 Apr 2013 16:57:23 -0700, Sam Siegel wrote:
>
> >On Sun, Apr 7, 2013 at 4:16 PM, Steve Thompson wrote:
> >> >
> >>
> http://pubs.opengroup.org/onlinepubs/9699919799/utilities/patch.html
> >>
> >>
> >>
> >> I read this rapidly. I'm
On Sun, 7 Apr 2013 16:57:23 -0700, Sam Siegel wrote:
>On Sun, Apr 7, 2013 at 4:16 PM, Steve Thompson wrote:
>> >
>> http://pubs.opengroup.org/onlinepubs/9699919799/utilities/patch.html
>>
>>
>>
>> I read this rapidly. I'm trying to understand certain headaches "we" have
>> with certain produc
On Sun, Apr 7, 2013 at 4:16 PM, Steve Thompson wrote:
> From: Paul Gilmartin
> Date: 04/07/2013 06:15 PM
>
>
>
> On Sun, 7 Apr 2013 18:08:54 -0400, Steve Thompson wrote:
> >
> >As a result this wonderful language, Java, has no sequence numbers, can
> be
> >wider than your wide LCD panels. No
From: Paul Gilmartin
Date: 04/07/2013 06:15 PM
On Sun, 7 Apr 2013 18:08:54 -0400, Steve Thompson wrote:
>
>As a result this wonderful language, Java, has no sequence numbers, can
be
>wider than your wide LCD panels. Now you need to make a change to
>something because of a bug report. How d
On Sun, 7 Apr 2013 18:08:54 -0400, Steve Thompson wrote:
>
>As a result this wonderful language, Java, has no sequence numbers, can be
>wider than your wide LCD panels. Now you need to make a change to
>something because of a bug report. How do you note the fix? And how do you
>send it? So far as I
From: Paul Gilmartin
Date: 04/07/2013 05:40 PM
But do sequence numbers have a lick of value today?
>
Shmuel and some of my coworkers think so. A telling observation
is that few editors other than from the IBM culture implement them.
BASIC used them both for editing and GOTO targets.
In
17 matches
Mail list logo
