branch from branch

[maciej <ma...@wp.pl>]

Hello,

I'm having a problem with merging branch which was made of another branch. I made a quick picture of what has happend.

First branch was made from trunk, I was working on it and after some time I made another branch from this branch and I merged trunk to it. Now I need to merge those branches to trunk.

I tried something like this:
1. I switched to trunk and merged from branch 1 revision A to branch 2 revision C. Merge was successful but it caused double conflicts - conflicted file was having two right and two left files for merging and my subversion plugin in eclipse was acting wierd.

2. I tried merging branch 2 (revision B - C) with branch 1 but it caused some internal error.

3. I merged branch 2 (revision D - C) with trunk. It caused some skipped files which I added manually by copying. But I think I might have lost some changes.

Could you advise me what to do best in this situation? I will be very thankful :)
If something is unclear, please let me know.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980483

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].