On Thu, Jun 16, 2011 at 02:27:52PM -0500, Henry Piņeros wrote:
> Hi all.
> I do a merge between two folders (source) (Ep. svn merge
> http:xxx/src http:xxx/src) and it works very well (It shows a File1.java
> with a conflcit -C)
> Whe and I try do it but directly in this file, the merges doesn't work (Ep.
> svn merge http:xxx/src/File1.java http:xxx/src/File1.java ).. It doesn't
> show the conflict, it show -U File1.java!!
Hmmm, your problem description is lacking a lot of detail :(
I will try to help you anyway:
Did you run "svn revert -R ." on your working copy before repeating
the merge? If you did not, then merge tracking might prevent changes
from being merged into the file because the file already has them.
All you will end up with in this case is probably a mergeinfo change.
If your working copy has no local changes (svn diff output is empty)
and you don't get any changes merged into your working copy,
try this command:
svn diff http:xxx/src/File1.java http:xxx/src/File1.java
and you will probably see that your merge has an *empty* diff.
So there is nothing to merge, and no conflict.
The only thing it changes is probably mergeinfo.
You probably want something like this instead:
svn merge -c 42 http:xxx/src/File1.java File1.java
svn merge http:xxx/src/File1.java_at_42 http:xxx/src/File1.java_at_43 File1.java
or this (to merge all outstanding changes):
svn merge http:xxx/src/File1.java File1.java
Received on 2011-06-16 22:11:09 CEST