Renaming/Moving files with TortoiseSVN

I had a file names "File1A" checked in to SVN.
I made another file based on it and named it "File1B".
I added and checked in updates on the 1B version.
So I now have two files in SVN.
No changes have occurred on 1A since working on 1B. So essentually I have a "pseudo-branch" with a renamed file.

I want to "merge" back to the 1A file, keeping the history of the 1B into the history of 1A.

I am unclear how if to resolve this, if I need to "Merge" 1B into 1A" with some kind of renaming occurring (pre or post merge), or if I need usage of "SVN Move and rename versioned item here" (per TortoisSVN).

My other alternative is to check each revision of 1B out and check in to 1A, which I'd prefer not to do.

Can anyone provide details on this?

Eric

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-11-08 18:09:31 CET