[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: Ryan Schmidt <subversion-2006Q1_at_ryandesign.com>
Date: 2006-01-25 11:08:36 CET

On Jan 25, 2006, at 10:47, Paul Maddox wrote:

> 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.

Nothing is ever lost, of course. It's still there in the repository.
You just have to know where to look.

The log of trunk will indeed only contain the log entry for the merge
from the branch, because that's the only operation that was ever
performed on the trunk. But in your merge log message you should
specify what branch you're merging from, and what revisions, so that
at any point later, you can get a log of that branch to see the
details about what was done there.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 25 11:10:18 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.