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

File revision history is lost when merging

From: Herbert, Gerhard <GHerbert_at_gleason.com>
Date: 2007-02-16 12:00:51 CET

Hello,

I am using tortoise as an svn client. Using the revision graph shows the
history of a file. For me it is confusing that after a merge it is not
possible to have the correct history:

Repository:
svn/project1/trunk
svn/project1/branches

svn copy trunk branches/branch1

Assuming that tere is a file foo.c in the trunk which was copied to
branch1. Now foo.c from branch1 is just a link from the file out of the
trunk.

Someone changes the file foo.c and commits it to the trunk.

Now when the change from the trunk is merged into the branch1, the file
branch1/foo.c is exactly equal to trunk/foo.c because foo.c was not
changed in branch1. A revision graph should show a link between this two
files but it seems that fhis information is lost in subversion. Is there
any possibility to establish this link? Copying the file trunk/foo.c to
branch1/foo.c would resolve the issue, but in some cases (when
branch1/foo.c was changed) it is not possible.

Thanks,
  Gerhard Herbert.
                 
Received on Fri Feb 16 12:01:36 2007

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.