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

Re: Branching strategy - Feature vs Release

From: Steve Strobel <steve.strobel_at_link-comm.com>
Date: 2006-11-22 18:47:19 CET

At 06:03 AM 11/8/2006, Duncan Murdoch wrote:
>On 11/8/2006 7:34 AM, Gundersen, Richard wrote:
>>Hi Duncan
>>Thanks for the reply, but you do have the full history of a file, even
>>if it was branched. Every time a change is made to that file, regardless
>>of which branch the change was made on, you get a log message (as long
>>as the developer writes one).
>>When you eventually merge it, you'd have one additional log message
>>saying something like "Merged from my_branch", as well as all the
>I agree the log messages aren't lost, but they aren't attached to
>the file on the trunk, they are out on the branch. So if you ask
>for a log of a file on the trunk you won't see them. You need to
>read the trunk log message to find out where the merge came from,
>and then go there, and read those messages.
>This may eventually change if svn gets better merge support, but
>right now, the svn log can't tell the difference between a merge and
>any other change on the trunk. There's no way for the client to
>automatically link the branch log message to the trunk file.
>Duncan Murdoch

I think you can see all of the log messages from the trunk and
branches in one list if you do it from the root of the repository,
rather than the trunk or a specific branch folder. I do that in
TortoiseSVN by opening the repo-browser, right-clicking on the root
folder, the selecting show log. I don't use the command line
interface, so I can't help you there. I am also not sure if there is
a way to display the log for a single file relative to the root of the rep.


Steve Strobel
Link Communications, Inc.
1035 Cerise Rd
Billings, MT 59101-7378
(406) 245-5002 ext 102
(406) 245-4889 (fax)
WWW: http://www.link-comm.com
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 22 18:54:20 2006

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