DOS ain't dead

Let's Make a DOS BBS in a offensively modern way (Miscellaneous)

posted by kerravon, Ligao, Free World North, 21.04.2024, 15:35

> > That reminds me - one of the great secrets of computing
> > appears to be a three-way diff, as exemplified by diff3.
>
> > But absolutely I need to go back to 1987 or thereabouts
> > and get a simple demo of diff3.
> >
> > I didn't pick it up (by osmosis) until 1995 or so, I think.
> >
> > However - diff3 and patch can be written in pure C90 -
> > that's how I was able to get them working on MVS.
>
> Honestly, I never use it, only normal DJGPP/GNU Diff.

You've never made independent changes to a file,
or worked with others who have, thus needing a
merge?

Did you manually merge?

It can be done automatically (this is just a simple
case - it handles more complex ones too):

[kerravon@paul-pinebook ddd]$ cat base
xxx
xxx
xxx
[kerravon@paul-pinebook ddd]$ cat person1
aaa
xxx
xxx
xxx
[kerravon@paul-pinebook ddd]$ cat person2
xxx
xxx
xxx
bbb
[kerravon@paul-pinebook ddd]$ diff3 -m person1 base person2 >merged
[kerravon@paul-pinebook ddd]$ cat merged
aaa
xxx
xxx
xxx
bbb
[kerravon@paul-pinebook ddd]$


I will digest the rest of your messages.

Complete thread:

• Let's Make a DOS BBS in a offensively modern way - DosWorld, 15.04.2024, 23:35
  • Let's Make a DOS BBS in a offensively modern way - Rugxulo, 16.04.2024, 01:57
    • Let's Make a DOS BBS in a offensively modern way - turboblack, 16.04.2024, 09:12
    • Let's Make a DOS BBS in a offensively modern way - kerravon, 20.04.2024, 03:14
      • Let's Make a DOS BBS in a offensively modern way - Rugxulo, 20.04.2024, 10:00
        • Let's Make a DOS BBS in a offensively modern way - kerravon, 20.04.2024, 11:19
          • Let's Make a DOS BBS in a offensively modern way - Rugxulo, 20.04.2024, 12:34
            • Let's Make a DOS BBS in a offensively modern way - Rugxulo, 20.04.2024, 12:57
            • Let's Make a DOS BBS in a offensively modern way - kerravon, 21.04.2024, 15:35