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

Problem with merging a branch into trunk

From: Richard Phillips <raphillips_at_ntlworld.com>
Date: 2006-08-07 11:26:39 CEST

Hello all,

I'm having a problem with merging a branch into the trunk and am hoping someone
might be able to help. I have read the FAQs and the manual and have been
unable to get anywhere.

I have a trunk and from this I created a branch, purely for test. I modified
one of the files in the branch, then committed it.
I then attempted to use the merge facility, I right-clicked on the trunk, then
selected merge. I selected the branch I wanted to merge from in both dialog
boxes and requested a merge from the HEAD to the version prior to the commit
with the changes I wanted merged, as instructed by the help file.
When I did a dry-run and when I did the merge for real, the dialog box reported
the file I had changed as being merged, so everything looks fine.
The problem is, the actual file in the trunk working folder doesn't get
modified! Everything looks ok apart from the fact that nothing happens!

I am using version 1.3.5.6804 on Windows XP Pro.

Regards,
Richard.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Aug 7 11:35:33 2006

This is an archived mail posted to the TortoiseSVN Users mailing list.