[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [Subclipse-users] Merge lost revisions

From: AcidShAwk <acidshawk_at_gmail.com>
Date: Thu, 21 Apr 2011 10:59:13 -0700 (PDT)

Bruno Velly wrote:
> 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
> ------------------------------------------------------
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2722091
> To unsubscribe from this discussion, e-mail:
> [users-unsubscribe_at_subclipse.tigris.org].

WOW! this is incredible.. on the exact same day we had the exact same

We just renamed a branch that had our whole commit history.. and now that we
need to merge changes from that renamed branch to a sister branch.. were
unable to do so..

View this message in context: http://old.nabble.com/Merge-lost-revisions-tp31448675p31451495.html
Sent from the subclipse - users mailing list archive at Nabble.com.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2011-04-21 20:00:47 CEST

This is an archived mail posted to the Subclipse Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.