CODEWITHSUNDEEP
svnmergetortoisesvnbranch
Dave
Dave

Reputation: 15016

Merging feature from deleted branch with TortoiseSVN is not working as expected

I deleted a branch a long time ago, and of course now I need to merge that feature into another branch. :)

I'm using TortoiseSVN, and I think I'm doing it the right way. I have changed the revision of the repo browser to the correct revision that has my branch right before it was deleted.

enter image description here

I then selected the range to merge, and it auto-filled the revision text to include the peg revision. But when I test the merge, it says, "path not found".

Is there something else I could be doing wrong here? I'm using TortoiseSVN 1.7.12, Build 24070 - 64 Bit.

Upvotes: 3

Views: 496

Answers (1)

gbjbaanb
gbjbaanb

Reputation: 52689

Short answer - you need to put the peg revision (ie the one just before you deleted the branch) in the URL you're merging from. You specify this with the @ symbol.

So say http://server.com/svn/branch@1234 instead of changing the 'snapshot' revision using the button. That button affects the destination too, which doesn't exist when you go 'back in time' like that.

TortoiseSVN docs have a much more detailed tutorial on doing this. I do think TortoiseSVN could make it more obvious - you need to specify the peg revision of the range to merge where I think this is obvious (ie if you merge rev 2, you're merging rev 2 no matter what snapshot view of the repo).

Still, the simple answer is to put the peg revision on the end of both URL and revision range.

Upvotes: 3

Related Questions