[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Group changes from log (for merge)?

From: David Balažic <david.balazic_at_comtrade.com>
Date: Thu, 15 Dec 2011 15:25:42 +0100

David Balažic wrote:
> Is there a way to somehow group changes in some meaningful
> way when merging?
> The scenario is this:
> - trunk in branched
> - there are changes done on trunk in multiple commits (also
> on branch - not the same changes)
> - merging chages from trunk to branch
> Does TSVN offer a way to give an overview of the cahnges to be merged?
> So the user would select "Merge trunk 1-HEAD to my branch
> (WC)" and then TSVN would
> present something like:
> - change rev 234, comment "Fixed bug with memleeak", changed
> files (list of changes filesm with the option of viewing the diff)
> - same for each change
> I guess this is similar to just viewing the log on the trunk,
> but already merged items would be filtered out.

I did some reading and the Show log from the merge dialog colors the already
merged revisions grey, which half the solution.
Additionally I have one question:
 - what does the blue color of some revision mean? I did not find this in the help file
(I use v1.6.16)

Also I noticed in our project, that some revisions are already merged, but not marked as such:
 - the changes are present in the brach (merge target)
 - svn:mergeinfo (on branch) does not have that revision number listed
 - trying to merge this revision just adds the rev number to svn:info

So my other question is: How to find all such cases (merged, but not marked as such)?
I seems this happened when a subfolder was merged, so the parent folder has no recording
of that in its svn:mergeinfo property.

Is there a way to detect, that a certain change involved just some subfolders (or files)
and it was merged on the subfolder level? So that change would be colored grey in the
merge/show log dialog invoked on the parent folder.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-15 15:26:03 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.