You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Paul Burba <pt...@gmail.com> on 2008/10/27 18:21:09 UTC
Merging the issue-3067-deleted-subtrees branch back to trunk
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,
http://subversion.tigris.org/servlets/ReadMsg?list=dev&&msgNo=141558,
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
http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=142100
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
respectively.
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).
Paul
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging the issue-3067-deleted-subtrees branch back to trunk
Posted by Paul Burba <pt...@gmail.com>.
On Mon, Oct 27, 2008 at 1:21 PM, Paul Burba <pt...@gmail.com> wrote:
> 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,
> http://subversion.tigris.org/servlets/ReadMsg?list=dev&&msgNo=141558,
> 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
> http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=142100
> 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
> respectively.
>
> 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).
>
> Paul
Merged to trunk in r34016.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging the issue-3067-deleted-subtrees branch back to trunk
Posted by Julian Foad <ju...@btopenworld.com>.
On Mon, 2008-10-27 at 14:21 -0400, Paul Burba wrote:
> The issue-3067-deleted-subtrees branch addresses all outstanding issue
> in the reopened issue #3067:
Yee-har! That's great, Paul.
> If anyone has some time to look at this branch I'd appreciate it.
If not the whole branch, ...
> 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
> respectively.
... then this new get-deleted-rev RA API would be good to look at. To
make this easier for review-by-email, I'm attaching a log of the branch
activity, pruned to the messages that appear relevant to a reviewer of
this API now, plus a diff of the branch (against its latest catch-up
point on trunk), again pruned to what appears relevant to review of this
API (mainly, this is omitting the changes to "merge.c" which is the
(only/main?) user of this API).
- Julian