Richard Phillips <raphillips@...> writes:
>
> 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.
>
Erm, I have now solved this :-/
I posted after spending hours on this last Friday, as soon as I post, I find
out the problem immediately!
I was putting HEAD in the top selection and the revision number I wanted below,
it should have been the other way around.
Sorry if I've wasted anyone's time on this.
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:46:15 2006