AW: Conflict on identical binary files

2012-02-28 Thread Markus Schaber
n HRB 6186 | Tax ID No.: DE 167014915 -Ursprüngliche Nachricht- Von: Daniel Shahaf [mailto:danie...@elego.de] Gesendet: Montag, 27. Februar 2012 15:11 An: Markus Schaber Cc: Subversion Dev (dev@subversion.apache.org) Betreff: Re: Conflict on identical binary files Welcome aboard M

AW: Conflict on identical binary files

2012-02-28 Thread Markus Schaber
.: DE 167014915 -Ursprüngliche Nachricht- Von: Daniel Shahaf [mailto:danie...@elego.de] Gesendet: Montag, 27. Februar 2012 15:11 An: Markus Schaber Cc: Subversion Dev (dev@subversion.apache.org) Betreff: Re: Conflict on identical binary files Welcome aboard Markus. There were a few i

Re: Conflict on identical binary files

2012-02-27 Thread Daniel Shahaf
For the record, I also moved the test to the end of the test_list, per a request on IRC. That avoids renumbering all existing tests.

Re: Conflict on identical binary files

2012-02-27 Thread Daniel Shahaf
Welcome aboard Markus. There were a few issues with this patch: * No log message * A typo in the docstring * A comment about binary props that didn't match the code below it * No issue number for a new XFail test They were easy to fix, and the patch itself was good, so I've fixed them myself and

AW: Conflict on identical binary files

2012-02-26 Thread Markus Schaber
Hi, Von: Philip Martin [mailto:philip.mar...@wandisco.com] > Markus Schaber writes: >> The last step (svn update) triggers a conflict prompt for svnobj, >> despite the fact that the remote and local files are bit-for-bit >> identical. >> >> As I was told by Daniel Shahaf, he expects this case

Re: Conflict on identical binary files

2012-02-24 Thread Philip Martin
Markus Schaber writes: > The last step (svn update) triggers a conflict prompt for svnobj, > despite the fact that the remote and local files are bit-for-bit > identical. > > As I was told by Daniel Shahaf, he expects this case to be resolved > without a conflict. We could resolve the conflict i

Conflict on identical binary files

2012-02-24 Thread Markus Schaber
Hi, Given 2 binary files svnobj.r14 and svnobj.r17, I execute the following batch file: --- snip --- svnadmin create repo svn mkdir -mm file:///C:/binconflict/repo/foo svn checkout file:///C:/binconflict/repo/foo Checked out revision 1. cd foo/ copy ..\svnobj.r14 .\svnobj svn add svnobj