Hello:
If I have a file at version 1. then I modefy and commit it, get version 2,
Now I make the file be same as version 1 and commit, get version 3.
Running "svn diff -r 1", I will get no changes, but "svn diff -r 1
--summarize" will get the file is modefied.
Best wishes,
Overview of problem:
Using svn client 1.8.10 on Mac OSX 10.9.4, downloaded from wandisco.
When trying to sync trunk to a branch with the command: svn merge ^/trunk
I get the following error:
svn merge ^/trunk
svn: E195016: Reintegrate can only be used if revisions 3 through 6 were
previously merge
Hi. Please CC.
While importing a very long revision with `svnadmin load repo < rev1`
I've got a message at the end:
...
* adding path : cif/9/9003895.cif ... done.
* adding path : cif/9/9009759.cif ... done.
svnadmin: /cif
svnadmin: Conflict at '/cif'
What does this conflict mean?
If m