Re: How does 'merge' work?

Dmitry Kulagin <craft095@mail.ru> writes:
> 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?

Can you show us the exact modifications you made? (A reproduction
script would help a lot here.) You're absolutely sure they conflict
textually?

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

Well, that would change the sense (i.e., the direction) of the diff, I
think... (?)

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Oct 21 18:08:12 2002