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.
On Tue, Mar 3, 2009 at 7:09 AM, Darren Pearce <[email protected]> wrote: > Hi, > When porting across changes from one branch to another, I now get a new > property on many of the destination branch's files. The new property is > svn:mergeinfo and its value is the path and version of the original. > However, this new property ends up being a new local change which I then > either commit (which I don't really want to do) or manually revert. > Is this expected behaviour or am I missing something? Isn't mergeinfo just a > 1.5 feature? I am using Subclipse in Eclipse so perhaps it is not passing > the right command-line somehow. > Many thanks, > :Darren. > >> >> On Jun 16, 8:50 am, "Ben Collins-Sussman" <[email protected]> wrote: > >> > Am I correct ? If so, is there any plan to switch to this version ? > >> > Any idea of when ? > >> Indeed, we're using 1.4 servers. Before we upgrade to 1.5, we need to >> wait > >> for 1.5 to be *released* first. :-) > > Subversion 1.5 was released last month. Google Code is still on > > version 1.4, though, right? ("svn mergeinfo" reports "svn: Retrieval > > of mergeinfo unsupported by '.'") > > Any idea when we'll be upgraded? > > -Dan > > -- > ---------------------------------------------------------------------- > :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 -~----------~----~----~----~------~----~------~--~---
