Merging problems

Hi,

I'm trying to merge a few simple revisions made on a branch back to the
trunk and cannot seem to get it to work. All of the changes made on the
branch need to be merged back.

If I choose "Reintegrate a branch" and then pick the branch where I made
my changes, I get the following error when I try and merge:
"Error: Cannot reintegrate into a working copy not entirely at infinite
depth " (and I have no idea what that means!).

If I do it the old way ("Merge a range of revisions") and manually
select the revision ranges on the branch where I made my changes, I get
the following error instead:
Error: REPORT of '/svn/venuefinder/!svn/bc/867/trunk': 200 OK
(http://ulysses)

Since TortoiseSVN introduced the dialog where you select one of three
options to perform a merge, I've NEVER been able to successfully do a
merge and have always had to do it manually by copying and pasting, but
I really don't have time to do that this today as it will take too long,
so I'm very keen to get merging working.

Thanks,

Nick

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2357422

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-06-01 11:38:27 CEST