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

RE: Merge and revision history

From: Gale, David <David.Gale_at_Hypertherm.com>
Date: 2006-01-25 14:47:27 CET

Paul Maddox wrote:
> I have a small problem with merges, let me explain...
> If I have a file called 'bob.txt' in the trunk at say revision 10.
> Then I do a branch.
> and work on the branch, and each time I do a commit I add a comment
> like "fixed xxx problem" or "first beta release" and so on. so the
> revision number for this file goes from 10 to 21, 22,23 and then 24.
> I do a merge at revision 30 of the repository.
> Now, when I look at the hostory of bob.txt, all the revision numbers
> are gone (anything after the branch and prior to the merge) and all
> the comments are also lost. when you look athe history you see
> revision 30 and then revision 10 :-(
> Is this a normal function of merging with subversion?
> It seems kinda daft that merging causes all the revision history and
> comments to be lost.

Makes perfect sense to me--you just need to be more explicit in your log
messages. If a developer makes a branch, and goes through five
revisions in the process of fixing a bug, and then merges those changes
back into the trunk, the merge log should be something along the lines
of "merged branch <foo> from revision <x> to <y>, fixing bug <bar>". I
don't need to know each and every step he went through to get there.

Of course, if you want to put the branch log messages into the merge log
message, that's easy enough...svn log -r<x>:<y> <branch> > <log_file>;
edit the log file, and use that as your commit message. Simple.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 25 14:50:53 2006

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

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