Minor problem with 'merge' output for added files.

[Vladimir Prus <gh...@cs.msu.su>]

If a file is added on two different branches, and I merge from one branch to 
another, that file is shown is added

    A  ./file

 although it is actually conflict. This looks like a bug, although very 
minor, to me. It should be easy to fix, but at the moment I don't have the 
time -- probably somebody just knows what place to change and can fix it in 
one minute.

- Volodya

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: Minor problem with 'merge' output for added files.

[Karl Fogel <kf...@newton.ch.collab.net>]

Vladimir Prus <gh...@cs.msu.su> writes:
> If a file is added on two different branches, and I merge from one branch to 
> another, that file is shown is added
> 
>     A  ./file
> 
>  although it is actually conflict. This looks like a bug, although very 
> minor, to me. It should be easy to fix, but at the moment I don't have the 
> time -- probably somebody just knows what place to change and can fix it in 
> one minute.

I'm not sure if it's a one-minute change or not.  Could you file an
issue about it, though, so it doesn't drop through the cracks?

Thanks,
-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org