AW: AW: merging executable binaries

2010-07-08 Thread Matthias Weyh
already included in one of the later subversion releases? Thanks, Matthias -Ursprüngliche Nachricht- Von: Daniel Shahaf [mailto:d...@daniel.shahaf.name] Gesendet: Donnerstag, 8. Juli 2010 10:33 An: Matthias Weyh Cc: users@subversion.apache.org Betreff: Re: AW: merging executable binaries

AW: merging executable binaries

2010-07-06 Thread Matthias Weyh
7-07 08:07 .svn -Ursprüngliche Nachricht- Von: Daniel Shahaf [mailto:d...@daniel.shahaf.name] Gesendet: Dienstag, 6. Juli 2010 20:35 An: Matthias Weyh Cc: users@subversion.apache.org Betreff: Re: merging executable binaries It's not clear to me exactly what you did. (The most unamb

merging executable binaries

2010-07-05 Thread Matthias Weyh
Hello, I have seen the following behaviour. added binary file to SVN with property svn:executable executable bits are then set on the file checked in the file added a branch which included the file modified the file in TRUNK merged the change to branch the executable flag on the file is then gone

Tree conflicts on merging into a branch

2010-04-28 Thread Matthias Weyh
Hello, I have seen an issue with subversion in which tree conflicts are being produced when creating a branch from a working copy in which not all files are at the same revision. This is happening when trying to merge changes into this branch. Please refer to the following sequence. Is this suppo