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

What is this merge doing?

From: Cory Burkhardt <cburk_at_cs.utsa.edu>
Date: 2005-11-04 16:47:45 CET

Hi, I am using TortoiseSVN and am attempting to merge a branch into the
trunk. The branch has been kept up to date with trunk changes, and now I
want to merge the branch changes to the trunk. This is exactly the
situation described in section 5.17.2 of the TortoiseSVN help. I put the
trunk location in the "From:" field and the branch location in the "To:"
field, selecting the HEAD revision in both instances (I know I'm the only
one working in svn right now). When I do a dry run, however, it is showing
me all kinds of files that I know haven't been modified since the two trees
were last synchronized. For instance, if I open up the repo browser and
select the same file in the two different trees and do a compare, it says
there are no differences. However, this same file is showing up in the dry
run as being "updated" for the merge I am attempting.


The only difference I can see between the two files is a differing date.
The date on the file in the branch directory is 10-20, whereas the date in
the trunk directory is 10-31. The 10-20 date is the real date that the
change was made. The 10-31 date was the date that this change was merged
back to the trunk. Is this the reason that this file is showing up in the
dry run now that I am attempting to merge from branch-->trunk again? Is
this file going to continue to show up every time I try to merge from my
branch back to the trunk unless I remove my branch and start a new one by
copying the trunk?


Merging is by far the most significant hurdle to jump when using Subversion.
I wish it would be more active in keeping track of copy/merge histories to
automate this process. Maybe a sysadmin that has thoroughly studied the
subversion system and is VERY organized could manage this process, but I
think it is much to complex and error prone to require every developer to
use this manual merge system.
Received on Fri Nov 4 19:26:00 2005

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.