Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
Eric B. wrote: > Tony did raise an interesting point, however, about sometimes wanting merge > in changes from a branch where the file has been moved/renamed, where one is > only interested in the content change and not interested in modifying the > file structure / layout. Basically, that would require that the change (in Arthur's "safe use" policy that would be a change marked with a bug number) is separated into two changes: the content changes that are not affected by the rename on one bug number, and then the rename and the content changes that depend on the rename on another bug number. Then you can merge the former without the latter. Otherwise, if you merge all of the change's content without the rename, your include directives or links will be wrong. Gerhard