[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-04-15 18:06:41 CEST

Vladimir Prus <ghost@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
Received on Mon Apr 15 18:03:01 2002

This is an archived mail posted to the Subversion Dev mailing list.