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

Merging the issue-3067-deleted-subtrees branch back to trunk

From: Paul Burba <ptburba_at_gmail.com>
Date: Mon, 27 Oct 2008 14:21:09 -0400

The issue-3067-deleted-subtrees branch addresses all outstanding issue
in the reopened issue #3067:

1) The tree conflict logic currently in trunk allows merge to delete a
file *if* the file is identical to file deleted in the merge source.
But currently, if a revision range is merged that first changes, then
deletes a (subtree) file, the changes are not applied before the
deletion. This means the file to be deleted will differ from the
merge source and a spurious tree conflict results. This problem was
first noted by Julian in this thread,
and is discussed in issue #3067 here,
http://subversion.tigris.org/issues/show_bug.cgi?id=3067#desc43. This
problem is demonstrated in the XFailing merge tests 77 'subtrees added
after start of merge range are ok' and 122 'subtree gets changes even
if ultimately deleted', both of which now pass on this branch.

2) Stefan Sperling also found yet another way to provoke the "svn:
Working copy path 'P' does not exist in repository" error, see
and http://subversion.tigris.org/issues/show_bug.cgi?id=3067#desc42.
This branch fixes that problem as well.

If anyone has some time to look at this branch I'd appreciate it.

This branch implements a new RA interface svn_ra_get_revision_deleted,
so even if you are not very familiar with the merge tracking code, if
you know your way around ra_serf/ra_neon it would be great if you
could glance at r33523 and/or r33562, the changes which implement the
ra-neon and ra-serf versions of the get-deleted-rev RA API

Ive run the [ fsfs | bdb ] x [ file | svn | http (neon) | http (serf)
] tests and everything looks good (i.e. I get some errors, but they
are the same I get on trunk).


To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-27 19:21:23 CET

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