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

Re: [PATCH] XFail test to prove issue #3146

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 1 Apr 2008 15:38:02 +0200

On Tue, Apr 01, 2008 at 05:32:31PM +0530, Senthil Kumaran S wrote:
> Hi Stefan,

Hey Senthil,

> I am attaching a patch along with this email which is an XFail test to
> prove issue #3146 (tree conflicts and obstructions), which is based on your
> reproduction recipe -
> http://subversion.tigris.org/nonav/issues/showattachment.cgi/864/recipe-issue-3146.sh

Thanks, this is great :)
It certainly saves me some time, cause I would have had to write
this test case otherwise!

> I ve tried my best to guess the expected status/output/etc :)

Note that tree conflicts are marked on the containing directory of
the tree conflict victim, not on the tree conflict victim itself.

The tree conflict victim is alpha-moved in your test, because
the merge cannot add this file to the working copy since it is
obstructed. [1]

To indicate tree conflicts, we use the first column ('C ') in the
status for the directory containing the conflicts -- in this case '',
meaning the working copy root. This is analogous to text conflicts
in files.

So the expected output should be something like:

  expected_output = svntest.wc.State(short_branch_path, {
    '' : Item(status='C '),
    'alpha' : Item(status='D '),

And the expected status should be something like:

  expected_status = wc.State(short_branch_path, {
    '' : Item(status='CM', wc_rev=3),
    'alpha' : Item(status='D ', wc_rev=3),
    'beta' : Item(status=' ', wc_rev=3),
    'alpha-moved' : Item(status='? ', wc_rev=3),

The way you wrote the expected output and status in the test means
that alpha-moved has a text conflict!

I plan to finally start working on a fix for this issue today.
Your test is a great contribution, and also quite on time :)

Please feel free to commit this test to the tree-conflicts branch
after fixing the expected output and expected status as noted above
(i.e. +1 from me).


[1] Unfortunately, this use case is not yet described anywhere
in notes/tree-conflicts/, but is the result of discussion between Julian,
Nico, and me. See the thread starting at

Stefan Sperling <stsp_at_elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner

  • application/pgp-signature attachment: stored
Received on 2008-04-01 15:37:29 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.