Hi Mark, > On Fri, Dec 17, 2021 at 3:49 PM Mun Johl <mun.j...@wdc.com> wrote: > > > > Hi all, > > > > We’re using SVN version 1.8.19 on Linux. I was wondering if I execute an > > “svn merge –reintegrate” to reintegrate a branch back to > trunk, will SVN merge the logs from the various check-ins done on the branch > back into the trunk as well? Empirical data shows that it > does not; but I’m not sure if we didn’t do something correctly during the > reintegration or if that is how SVN works. Although, I realize > I can still access the branch’s logs for check-in information. > > Merge is really a local edit to your working copy ... you still have > to commit it and that commit is just a new commit like any other. When > you do a merge it edits the svn:mergeinfo property which is how SVN > knows what was merged. As long as you include those property changes > in your commit then SVN "knows" it is a merge. > > When using the svn log command you can add the "-g" option to have it > look at the mergeinfo and show the logs of the commits that were > merged. For example, here is a snippet of a recent merge in the SVN > repository. You will see the log for the merge commit and then it > starts showing the logs of the commits that were merged. In this case > there were actually a lot of revisions so I am just showing the first > couple. GUI tools like TortoiseSVN can also show this information.
[Mun] Oh yeah, I had forgotten about "-g"; thank you for that tip! That will certainly come in handy. Best regards, -- Mun
