On Fri, Jan 21, 2011 at 02:09:13AM -0800, JamieEchlin wrote: > > > Stefan Sperling-7 wrote: > > > >> How do I see if file "a" came from 1 or from 2? > >> How do I see from which revision of file 3 came file c? > >> > >> After the check-in, it's clear: svn log will show it. > >> > >> How do I review (if it's ok what I did) BEFORE checking-in? > > > > svn info a | grep ^Copied > > > > > I was going to ask a similar question, it's so similar that I'll tack it > onto this. > > How do you find out from the working copy, either with svn subcommands or > working copy api, what was the source(s) of a merge, before commiting? > > Of course, I can diff the svn:mergeinfo, and this works if just one line of > it has changed. But if I merge from C to B to A, mergeinfo on A will have > entries for both C and B... how can I tell which was the source of this > merge?
There is nothing that tells you this information directly. The changes brought in by a merge are treated just like any other local changes. As far as Subversion is concerned, you could have made any merged changes manually. Defining a good branching/merging strategy, making sure everyone knows it, and consistently keeping to it may help with avoiding such questions in the first place. Stefan
