On 6/30/06, Jens Seidel <jensseidel@users.sf.net> wrote:
> Hi all,
>
> I merged a file multiple time where the first merge adds this file. I noticed
> that there is a conflict in this file which is not indicated by svn status:
>
> $ svn status configure.ac
> A + configure.ac
>
> Is there a valid status flag for this situation at all?
> I expected "C + " or something similar.
>
> $ ls -l configure.ac*
> -rw-r--r-- 1 jens users 4049 Jun 30 16:25 configure.ac
> -rw-r--r-- 1 jens users 4091 Jun 30 15:59 configure.ac.merge-links.r209
> -rw-r--r-- 1 jens users 4206 Jun 30 15:59 configure.ac.merge-rechts.r210
> -rw-r--r-- 1 jens users 3920 Jun 30 15:59 configure.ac.working
> $ svn resolved configure.ac
> Resolved conflicted state of 'configure.ac'
> $ svn resolved configure.ac
> $ svn status configure.ac
> A + configure.ac
>
> I'm not sure whether I'm able to reproduce this, but I could try if you want.
> My subversion version is 1.3.0 (r17949).
>
> Is this problem already known?
No, this problem is new. If you could create a reproduction recipe I
would be most gratefull!
Thanks in advance.
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jul 2 11:37:10 2006