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

tree conflicts conflict with implementation of test for issue #2829

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 24 Mar 2008 13:30:10 +0100

Hi again,

Going through the failing tests on the tree-conflict branch,
I've caught another test that triggers a tree conflict but
does not handle this correctly at the moment.

The test in quesion is this one:

def mergeinfo_recording_in_skipped_merge(sbox):
  "mergeinfo recording in skipped merge"

The test stems from issue #2829. The problem seems to be that
the test assumes that:

1. Creating a branch off trunk:

  # Create a WC with a single branch
    wc_dir = sbox.wc_dir
    wc_disk, wc_status = set_up_branch(sbox, True, 1)

2. Deleting a file in the branch:

  # Delete A_COPY/B/E
  svntest.actions.run_and_verify_svn(None, None, [], 'rm',

3. And then merging new revs from trunk into the branch:

  # Merge /A to /A_COPY ie., r1 to r4
  svntest.actions.run_and_verify_merge(short_A_COPY, None, None,

... causes 'merge' to skip the deleted file.

However, on the tree-conflicts branch, this does not cause a skip
anymore, but a tree conflict.

Quoting the "USE CASE 4" section from notes/tree-conflicts/detection.txt:

  If 'svn merge' tries to modify a file that does not exist in the
  target working copy, then the target file is a tree conflict victim.

So can the test be adjusted in a way that makes the merge cause
a skip, but not a tree conflict?

One idea that comes to mind is that skipped merges should still occur
for merges with source directories that the user has no authorisation
for. If the test could somehow emulate that, it would pass again.

Anyone involved in fixing issue #2829 around for comments?
dlr? pburba? stylesen?

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-03-24 13:29:47 CET

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