> > Yes, this is how merge tracking works. You run 'svn merge', and the > svn client generates a bunch of metadata recording the fact that a > merge happened. The svn;mergeinfo property on various files & dirs > *is* the metadata. If you don't submit that metadata into the > repository (along with your regular changes), then future invocations > of 'svn merge' will have no idea the merge ever happened. In other > words, this is all by design: merge-tracking is mostly a client > thing; the repository is just blindly managing the metadata. Just > ignore the metadata and work as usual.
Many thanks for the quick response. When you say 'ignore the metadata', I assume you mean I should just commit it as normal rather than reverting it. As you say, this is needed so that merging isn't so naive (as was the case in 1.4 I believe). This seems a little awkward to me since when I generate a delta from a version range on one branch and port it to another, I want the list of changed files to be the same in both commits. With this svn:mergeinfo property, there will be many more files with changes due to the merge. Thanks again, :Darren. -- ---------------------------------------------------------------------- :Darren :Pearce ---------------------------------------------------------------------- *** Shop & Donate: http://buy.at/campuskids *** ---------------------------------------------------------------------- [email protected] Postdoctoral Researcher London Knowledge Lab, University of London ---------------------------------------------------------------------- [email protected] Visiting Research Fellow Informatics, University of Sussex http://www.informatics.sussex.ac.uk/users/darrenp/ ---------------------------------------------------------------------- [email protected] http://www.linkedin.com/in/darrenpearce ---------------------------------------------------------------------- --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Hosting at Google Code" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/google-code-hosting?hl=en -~----------~----~----~----~------~----~------~--~---
