[Subclipse-users] Merge lost revisions

From: Bruno Velly <bruno.velly_at_freesbee.fr>
Date: Thu, 21 Apr 2011 02:28:37 -0700 (PDT)

Hello,

I'm using eclipse helios sr2 with subclipse 1.6.17, on a project containing a trunk and several branches.The problem is the following:

1) developperA modifies the file branch/directoryA/toto.f and commit in his branch (revision 5)

2) in the same time, developperB decided to rename trunk/directoryA in trunk/directoryB and commit in the trunk (revision 6)

3) then, developperA wants to merge "from trunk to branch" in order to be on time before going on in his work and reintegrating to the trunk.

The result is that branch/directoryA is moved to branch/directotyB but toto.f is not modified. The developpement made by developperA has disappeared!

To make the merge, I did:
1) update to head the branch
2) team > merge > merge a range of revision > all eligible revisions > always mark conflict

Did I forgotten something in the way to merge?

Thanks

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2011-04-21 13:17:37 CEST