http://subversion.tigris.org/issues/show_bug.cgi?id=2839
Issue #|2839
Summary|Support non-inheritable mergeinfo
revision ranges
Component|subversion
Version|trunk
Platform|All
URL|
OS/Version|All
Status|NEW
Status whiteboard|
Keywords|
Resolution|
Issue type|DEFECT
Priority|P1
Subcomponent|libsvn_repos
Assigned to|pburba
Reported by|pburba
------- Additional comments from pburba tigris.org Tue Jul 17 08:33:07 -0700 2007 -------
Normally when a merge sets mergeinfo on a PATH, all of
PATH's children without
their own explicit mergeinfo inherit the mergeinfo, path
adjusted of course,
from PATH.
Problems arise however if some of PATH's children are
missing, due to authz
restrictions, switched children, sparse checkouts, etc. See
these threads for a
full discussion:
htt
p://svn.haxx.se/dev/archive-2007-04/0678.shtml
htt
p://svn.haxx.se/dev/archive-2007-06/0595.shtml
htt
p://svn.haxx.se/dev/archive-2007-07/0038.shtml
So we need a way to represent non-inheritable mergeinfo,
specifically the
revision ranges, which are non-inheritable. At kameshj's
suggestion I'm using a
'*' after the revision ranges in mergeinfo to represent
non-inhertiable ranges,
e.g.:
>svn pl -v merge_tests-50A_COPYDH
Properties on 'merge_tests-50A_COPYDH':
svn:mergeinfo : /A/D/H:1,3-5*,7*
We are of course free to bikeshed about the use of '*'.
Supporting non-inheritable ranges in the sqlite db is the
easy part.
Identifying missing paths, their parents, their siblings,
and applying,
inheriting, and eliding the appropriate mergeinfo is a bit
more work. Things
are coming along though and hope to have a complete patch
soon.
------------------------------------------------------------
---------
To unsubscribe, e-mail: issues-unsubscribe subversion.tigris.org
For additional commands, e-mail: issues-help subversion.tigris.org
|