On 7/5/2007 6:33 PM, Raman Gupta wrote: >> People interested in true graph merge support are encourage to provide a >> more complete meta-merge implementation (manual merge of prop-merge >> conflicts). > > Absolutely. Perhaps until such an implementation is available, > svnmerge.py should be modified to fail gracefully if a graph merge is > attempted? Currently I believe graph merges will most likely result in > conflicts due to reflected revisions via intermediate branches.
At most, a warning message could be spouted. I would be uneasy to make it fail just because we think it cannot work. We might be wrong :) -- Giovanni Bajo _______________________________________________ Svnmerge mailing list [email protected] http://www.orcaware.com/mailman/listinfo/svnmerge
