Re: [Rosegarden-devel] Parallels Project, updated patch

[Colin F. <col...@go...>]

On 11/06/15 02:34, Ted Felix wrote:
> On 06/10/2015 05:02 PM, D. Michael McIntyre wrote:
>> Sooo....  Give it another go, if you would, and let's see if I got it
>> straightened out this time.
> 
>    Looks like all the files are there, however, this is strange... 
> These files:
> 
> src/commands/notation/MarkParallelCommand.cpp
> src/gui/dialogs/CheckForParallelsDialog.cpp
> 
> ...appear to have duplicate copies of themselves within themselves 
> (search for Author: to see what I mean).  MarkParallelCommand.cpp has 
> two copies of itself, while CheckForParallelsDialog.cpp has three copies 
> of itself.  I reduced them to just one and the build went fine.
> 
>    Bizarre.  Can anyone else verify?
> 

Yes, the same here.

Looking at the original patch file, it adds the lines as a diff to those
files, thus:

Index: src/commands/notation/MarkParallelCommand.cpp
===================================================================
--- src/commands/notation/MarkParallelCommand.cpp	(revision 0)
+++ src/commands/notation/MarkParallelCommand.cpp	(working copy)
@

So running plain 'patch' a second (or subsequent) time will have added
the contents again to the files, rather than just creating the file
anew. I think that 'svn patch' should have done the right thing with
this patch file: at least, 'svn help patch' says that it will 'svn add'
files created by the patch.

Anyway, deleting the duplicated lines at least gets the build working
again; I haven't tried running it yet, though...

Cheers,

Colin.