[FFmpeg-devel] [PATCH] doc&tools: Add murge script, for analyzing 3 way conflicts.

[Michael Niedermayer]

On Mon, Aug 22, 2016 at 11:29:45AM +0200, Clément Bœsch wrote:
> On Thu, Aug 18, 2016 at 06:45:23PM +0200, Michael Niedermayer wrote:
> > TODO: tempfiles
> > 
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  doc/libav-merge.txt |  4 ++++
> >  tools/murge         | 13 +++++++++++++
> >  2 files changed, 17 insertions(+)
> >  create mode 100755 tools/murge
> > 
> > diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
> > index 60c953a..4b2bb76 100644
> > --- a/doc/libav-merge.txt
> > +++ b/doc/libav-merge.txt
> > @@ -103,6 +103,10 @@ It has two modes: merge, and noop. The noop mode creates a merge with no change
> >  to the HEAD. You can pass a hash as extra argument to reference a justification
> >  (it is common that we already have the change done in FFmpeg).
> >  
> > +Also see tools/murge, you can copy and paste a 3 way conflict into its stdin
> > +and it will display colored diffs. Any arguments to murge (like ones to suppress
> > +whitespace differences) are passed into colordiff.
> > +
> >  TODO/FIXME/UNMERGED
> >  ===================
> >  
> > diff --git a/tools/murge b/tools/murge
> > new file mode 100755
> > index 0000000..1983fed
> > --- /dev/null
> > +++ b/tools/murge
> > @@ -0,0 +1,13 @@
> > +#!/bin/sh
> > +
> > +grep -A99999 '^<<<<<<<' | grep -B99999 '^>>>>>>>' >murge.X
> > +grep -A99999 '^====' murge.X | egrep -v '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.theirs
> > +grep -B99999 '^||||' murge.X | egrep -v '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.ours
> > +grep -B99999 '^====' murge.X | grep -A99999 '^||||' | egrep -v '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)'  >murge.common
> > +
> > +colordiff -du $* murge.ours murge.theirs
> > +grep . murge.common > /dev/null && colordiff -du $* murge.common murge.theirs
> > +grep . murge.common > /dev/null && colordiff -du $* murge.common murge.ours
> > +rm murge.theirs murge.common murge.ours murge.X
> > +
> 
> I haven't tested yet but it should be fine

ok, what about the temp files ?
should i apply the patch as is or wait ?
nicolas seemed not happy about the temp files ?

[...]



-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Its not that you shouldnt use gotos but rather that you should write
readable code and code with gotos often but not always is less readable
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160822/b44ef0fc/attachment.sig>