You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Alexander Kitaev <al...@tmate.org> on 2005/11/08 18:10:15 UTC
Props conflict probably reported incorrectly on merge.
Hello All,
The problem I would like to report is best described with the "merge 4"
python test:
merge_tests.py, line 776:
# Merge B 3:4 into B2 now causes a conflict
expected_disk.add({
'E/dir_conflicts.prej'
: Item("Trying to change property 'foo' from 'foo_val' to 'mod_foo',\n"
+ "but the property does not exist."),
'E/alpha.prej'
: Item("Trying to change property 'foo' from 'foo_val' to 'mod_foo',\n"
+ "but the property does not exist."),
'E/beta.prej'
: Item("Trying to change property 'foo' from 'foo?\\129val' to"
+ " 'mod?\\129foo',\n"
+ "but the property does not exist."),
})
expected_disk.tweak('E', 'E/alpha', props={'bar' : 'bar_val'})
expected_disk.tweak('E/beta', props={'bar' : 'bar\201val'})
expected_status.tweak('E', 'E/alpha', 'E/beta', status=' C')
svntest.actions.run_and_verify_merge(B2_path, '3', '4', B_url,
expected_output, /// *
expected_disk,
expected_status,
expected_skip,
None, None, None, None, None, 1)
* expected_output variable is set at line 729:
expected_output = wc.State(B2_path, {
'E' : Item(status=' U'),
'E/alpha' : Item(status=' U'),
'E/beta' : Item(status=' U'),
})
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.
Alexander Kitaev,
TMate Software,
http://tmate.org/
http://jetbrains.com/tmate/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: Props conflict probably reported incorrectly on merge.
Posted by Alexander Kitaev <al...@tmate.org>.
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" <al...@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
Re: Props conflict probably reported incorrectly on merge.
Posted by Daniel Rall <dl...@collab.net>.
On Tue, 08 Nov 2005, Philip Martin wrote:
> "Alexander Kitaev" <al...@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
Re: Props conflict probably reported incorrectly on merge.
Posted by Philip Martin <ph...@codematters.co.uk>.
"Alexander Kitaev" <al...@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.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org