On 7/3/06, Garrett Rooney <rooneg@electricjellyfish.net> wrote:
> On 7/3/06, Jens Seidel <jensseidel@users.sf.net> wrote:
> > Hi Erik,
> >
> > On Sun, Jul 02, 2006 at 11:35:38AM +0200, Erik Huelsmann wrote:
> > > On 6/30/06, Jens Seidel <jensseidel@users.sf.net> wrote:
> > > >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:
> > > >
> > > >Is there a valid status flag for this situation at all?
> > > >I expected "C + " or something similar.
> > > >
> > > >Is this problem already known?
> > >
> > > No, this problem is new. If you could create a reproduction recipe I
> > > would be most gratefull!
> >
> > OK, it was not very difficult to reproduce it. I also noticed that subversion
> > is really aware of this conflict, it's just not possible to display it in the
> > svn status output.
>
> A quick look at 'assemble_status' in libsvn_wc/status.c indicates that
> we set our text status to 'conflict', then proceed to overwrite it
> with added. Perhaps 'conflict' should win? That wouldn't pass along
> the + though, IIUC...
My thoughts would be that C should prevail, yes.
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jul 3 19:12:38 2006