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

Log Message for merges pulls in too much info

From: Gavin Lambert <colnet_at_mirality.co.nz>
Date: Mon, 2 Jul 2012 18:48:08 -0700 (PDT)

Currently using TSVN 1.7.7.

I was using Merge (a range of revisions) to merge a large group of changes from one branch to my working copy (which was on another branch). I was selecting all revisions within a particular range on that branch (contiguous block within the log window), but the revision numbers themselves were not contiguous (because other commits had happened interleaved on other branches).

The actual merge worked properly and included the correct files, but the automatic log message that went into the Recent Messages button in the commit window was incorrect.

The intro line was correct ("Merged revision(s) 18279-18366 from branches/Foo/Bar:"), but then the log messages it pulled in below were from *all* revisions in that range, not just those revisions that actually affected that branch. As a result it included commit messages from completely unrelated branches that were not part of this merge, but happened to fall within that numeric range.

It works fine if I cherry-pick individual non-adjacent commits from the log, but any time it "simplifies" to a range of revisions (which is itself a good thing and shouldn't be changed) it ends up including the wrong messages.

Also, a somewhat unrelated thing that I find a bit weird is that when I'm trying to merge in changes from a parent branch or the trunk and click on Show Log from the merge window, it doesn't seem to correctly show which revisions are already merged (in particular, those from before the branch was actually created, ie. the "natural history" of the branch); it does correctly avoid merging these in though. Another message talking about something similar (http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2950230) suggested turning on LogFindCopyFrom, but I tried that and it doesn't seem to have any effect. Do I need to do anything special (eg. reboot) to apply that, or is that the wrong setting? And why isn't it enabled by default?


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-07-03 03:48:16 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.