Re: Conflict when merging the same file to a branch

"Sergey A. Lipnevich" <sergeyli@pisem.net> writes:

> Also (I don't want to bother this this but maybe you'll find it
> interesting), during the merge operation, some files were indented two
> spaces from first (status) character (A, U), and some -- eight
> spaces. I was under impression that these are quite important, so Is
> that normal?

It's normal (as in "expected"), but broken. It's basically the result
of some code abstraction, where the abstracted code generates
notification messages. Problem is that the notification messages need
to be different for the various operations that are calling this
common code. We just need to take some time to iron out some bumps in
our notification scheme.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jun 11 01:28:05 2003