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

2016-08-22 Thread Michael Niedermayer
On Mon, Aug 22, 2016 at 06:39:24PM +0200, Nicolas George wrote: > Le sextidi 6 fructidor, an CCXXIV, Michael Niedermayer a écrit : > > nicolas, ok if i apply it as is ? > > Just like Clément, I was only pointing possible avenues for enhancement. ok applied thx [...] -- Michael GnuPG fing

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

2016-08-22 Thread Nicolas George
Le sextidi 6 fructidor, an CCXXIV, Michael Niedermayer a écrit : > nicolas, ok if i apply it as is ? Just like Clément, I was only pointing possible avenues for enhancement. Regards, -- Nicolas George signature.asc Description: Digital signature _

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

2016-08-22 Thread Michael Niedermayer
On Mon, Aug 22, 2016 at 06:13:05PM +0200, Clément Bœsch wrote: > On Mon, Aug 22, 2016 at 06:08:08PM +0200, Michael Niedermayer wrote: > > 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

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

2016-08-22 Thread Clément Bœsch
On Mon, Aug 22, 2016 at 06:08:08PM +0200, Michael Niedermayer wrote: > 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 > > > --- > > > doc/

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

2016-08-22 Thread 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 > > --- > > doc/libav-merge.txt | 4 > > tools/murge | 13 + > > 2 files

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

2016-08-22 Thread Clément Bœsch
On Thu, Aug 18, 2016 at 06:45:23PM +0200, Michael Niedermayer wrote: > TODO: tempfiles > > Signed-off-by: Michael Niedermayer > --- > doc/libav-merge.txt | 4 > tools/murge | 13 + > 2 files changed, 17 insertions(+) > create mode 100755 tools/murge > > diff --git a/d

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

2016-08-18 Thread Michael Niedermayer
TODO: tempfiles Signed-off-by: Michael Niedermayer --- 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-me

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

2016-08-18 Thread Michael Niedermayer
On Wed, Aug 17, 2016 at 07:34:07PM +0200, Nicolas George wrote: > Le primidi 1er fructidor, an CCXXIV, Clement Boesch a écrit : > > maybe these files should be in /tmp > > > > i'd also suggest > > > > TMPFILES="murge.theirs murge.common murge.ours murge.X" > > trap 'rm -f -- $TMPFILES' EXIT > >

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

2016-08-18 Thread Michael Niedermayer
On Wed, Aug 17, 2016 at 07:34:07PM +0200, Nicolas George wrote: > Le primidi 1er fructidor, an CCXXIV, Clement Boesch a écrit : > > maybe these files should be in /tmp > > > > i'd also suggest > > > > TMPFILES="murge.theirs murge.common murge.ours murge.X" > > trap 'rm -f -- $TMPFILES' EXIT > >

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

2016-08-17 Thread Nicolas George
Le primidi 1er fructidor, an CCXXIV, Clement Boesch a écrit : > maybe these files should be in /tmp > > i'd also suggest > > TMPFILES="murge.theirs murge.common murge.ours murge.X" > trap 'rm -f -- $TMPFILES' EXIT > > (stolen from configure) Temporary files are annoying and tricky (and configur

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

2016-08-17 Thread Clément Bœsch
On Wed, Aug 17, 2016 at 07:06:44PM +0200, Michael Niedermayer wrote: > Signed-off-by: Michael Niedermayer > --- > 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/

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

2016-08-17 Thread Clément Bœsch
On Wed, Aug 17, 2016 at 07:06:44PM +0200, Michael Niedermayer wrote: > Signed-off-by: Michael Niedermayer > --- > 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/

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

2016-08-17 Thread Michael Niedermayer
Signed-off-by: Michael Niedermayer --- 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..47c513a 100644 --- a/doc/libav-merge.txt +++ b/doc