How does 'merge' work?

I was wondering if someone could explain me
the problem I'm faced with (built 3200,
local repository).

I have downloaded latest interim version
and tried to make/merge branches.

I took the following actions:
    1. svn cp dir dir_branch

    2. svn ci
        
    3. then edit existing files in order
       to make conflict:
            dir/a.txt
            dir_branch/a.txt
    
    4. svn ci
            ---> M dir/a.txt
            ---> M dir_branch/a.txt

and then I ran 'merge':
    5a. svn merge dir dir_branch dir_branch
            ---> _ dir/a.txt
            
    5b. svn merge dir_branch dir dir_branch
            ---> U dir/a.txt

Both variants did not found conflicts. Why?

And another question: why does the result
depend on order of the first two arguments?

Please, make CC to craft095@mail.ru, I am
not in the mailing list.

Thanks,
Dmitry Kulagin

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Oct 21 17:24:02 2002