On Wednesday 25 January 2006 7:47 am, Gale, David wrote:
> 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.
Just a warning from personal experience (pain) about using the logfile in a
commit message: if you do not prefix the copied message, or make it easily
understandable, it becomes **incredibly** difficult and frustrating to read.
Take this for example (just imagine what might happen if those # marks
weren't there to show the injection of log messages into log messages):::
------------------------------------------------------------------------
r3824 | trebec | 2006-01-26 17:14:06 -0600 (<real date here>) | XX lines
Changed Paths:
M /website/trunk/lib/baseClass.code
Ported fix to trunk: merge -r3804:3822 /website/branches/dev/
Log messages:
#------------------------------------------------------------------------
#r3822 | trebec | 2006-01-26 12:16:55 -0600 (<real date here>) | XX lines
#Changed Paths:
# M /website/branches/dev/lib/baseClass.code
#
#Fixed bug #3004 in dev.
#
##------------------------------------------------------------------------
##r3805 | trebec | 2006-01-21 13:10:18 -0600 (<real date here>) | XX lines
##Changed Paths:
## M /website/branches/bugfix/templates/stuff/index.tmpl
## M /website/branches/bugfix/templates/stuff/second.tmpl
## M /website/branches/bugfix/templates/services/rates.tmpl
## M /website/branches/bugfix/templates/help/browsers.tmpl
## M /website/branches/dev/lib/baseClass.code
##
##Changed a ton of templates to have the new link, and fixed a bug (3004).
##
------------------------------------------------------------------------
r3802 | johnq | 2006-01-20 23:52:44 -0600 (<real date here>) | XX lines
Changed Paths:
M /website/branches/dev/lib/baseClass.code
Fixed bugs: 3001, 3002, 3003
------------------------------------------------------------------------
>
> -David
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
--
Best Regards,
Dan Falconer
"Head Geek",
AvSupport, Inc. (http://www.partslogistics.com)
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 27 00:55:24 2006