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

RE: Props conflict probably reported incorrectly on merge.

From: Alexander Kitaev <alex_at_tmate.org>
Date: 2005-11-08 22:14:28 CET

I've sumbitted the following issues:

http://subversion.tigris.org/issues/show_bug.cgi?id=2438
http://subversion.tigris.org/issues/show_bug.cgi?id=2439

> Alexander, will you please file an issue with steps to
> reproduce, observed behavior, and expected behavior? Thanks!
This very problem is best demonstrated by "merge 4" python test, that hides
this bug. As long as this test pass there is incorrect prop status reported
for properties conflict on merge. I've included more details into submitted
issue.

Alexander Kitaev,
TMate Software,
http://tmate.org/
http://jetbrains.com/tmate/

> -----Original Message-----
> From: Daniel Rall [mailto:dlr@collab.net]
> Sent: Tuesday, November 08, 2005 21:44
> To: Philip Martin
> Cc: alex@tmate.org; dev@subversion.tigris.org
> Subject: Re: Props conflict probably reported incorrectly on merge.
>
> On Tue, 08 Nov 2005, Philip Martin wrote:
>
> > "Alexander Kitaev" <alex@tmate.org> writes:
> >
> > > So, subversion properly detects properties conflict and generates
> > > appropriate .prej file, but prop status reported is 'U', not 'C'.
> > >
> > > I suppose that there is a bug in Subversion, but it may
> happen that
> > > I just missed something.
> >
> > Yes, that looks like a bug.
>
> Alexander, will you please file an issue with steps to
> reproduce, observed behavior, and expected behavior? Thanks!
> --
>
> Daniel Rall
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 8 22:17:43 2005

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