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

Re: [RFC] Mergeinfo and missing children of merge target

From: Vlad Georgescu <vgeorgescu_at_gmail.com>
Date: 2007-06-20 20:11:32 CEST

Paul Burba wrote:
> As cmpilato pointed out here,
> http://svn.haxx.se/dev/archive-2007-04/0709.shtml
> we have a problem with inheritable mergeinfo and "missing" paths in the
> current merge-tracking implementation.
> A merge target may have children that are "missing" due to the
> following:
> A) Authz restrictions
> B) Deleted via the OS rather than svn
> C) Sparse checkouts
> D) Child is switched - Yes, the path isn't really missing, but the
> impact is the same.
> (Any other causes of "missing" paths I'm forgetting?)
> Merging to a target with a missing child path results in the missing
> child (which obviously never had any changes merged into it) incorrectly
> inheriting the merge info set on the merge target path. This is not a
> big problem if the merge didn't effect any paths within the missing
> tree, but if it did then the mergeinfo set on target is incorrect.
> [...]
> Any opinions on the suggested solutions or alternatives appreciated,
> thanks,

OK, here's an idea:

For case A above, the server uses the absent-directory and absent-file
editor commands, right? And we have the capability to record paths as
absent in the working copy. Maybe we can use the same trick for B and C
(either make the server send the commands, or detect absent
directories/files locally when we receive a merge to a nonexistent path).

Then, when committing, send the absent-directories/absent-file commands
back to the server, so it will know which paths should *not* inherit

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jun 20 20:11:47 2007

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.