Re: [Gnu-arch-users] hate bk? here's a challenge

[Robin Farine]

>>>>> "Tom" == Tom Lord <address@hidden> writes:

Well, I can't hate bk mainly because I don't know anything about it
except that a few Linux kernel developers use it. But hey, challenges
are another story :)

[...]

    Tom> So, the challenge is:  who wants to add support to GNU diff3 to emit 
    Tom> context diffs in more or less that style?

As discussed on IRC, I've added some ugliness of my own to diff3 (I'm
particularly proud of the resulting output_diff3_merge() ;)).


'diff3 -u <mine> <old> <yours>' outputs changes with range of line numbers
that changed between <mine> and <old> or <yours> and <old> in a format
derived from what 'diff3 <mine> <old> <yours>' produces.


'diff3 -m -u <mine> <old> <yours>' outputs conflicts marked as in

<<<<<<< <old>
- ....
+ ....
>>>>>>> <yours>

when <old> differs and marked as in

<<<<<<< <mine>
- ...
+ ...
=======
- ...
+ ...
>>>>>>> <yours>

when all files differ.


You can (hopefully) get it for review and comments from the following
archive:

address@hidden
        http://213.200.230.54/{software.v2}/2003

address@hidden
  diffutils
    diffutils--rnf
      diffutils--rnf--2.7

        base-0    (tag revsision ...)
          tag of address@hidden/diffutils--upstream--2--base-0

        patch-1    (simple changeset)
          new diff3 '-u' option for unified output

    diffutils--upstream
      diffutils--upstream--2

        base-0    (initial import)
          import diffutils-2.7

-- 
rnf