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

Merge and revision history

From: Paul Maddox <P.Maddox_at_signal.QinetiQ.com>
Date: 2006-01-25 10:47:51 CET


 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.


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