reintegrate a branch problem

From: eddie lu <ly9637_at_gmail.com>
Date: Mon, 13 Aug 2012 01:35:08 -0700 (PDT)

the thing is, let's say there is a trunk with lots of code files, someone uncomment a line of code, he committed the change set to the trunk, made the revision 100. then he found he made a mistake, he went back to reverse the changes he made just now and committed to trunk, made the revision 101.

I have a branch, synchronizing trunk everyday. one day I continuously merged revision 99-102 to my branch.

I got my job done and reintegrate my branch back to trunk, an error raised telling me revision 100-101 missed.

any help?

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-08-13 10:47:09 CEST

This message: [ Message body ]
Next message: Steve Young: "upgraded from 1.6.6 to 1.7.7"
Previous message: luebbe.tortoisesvn_at_gmail.com: "TortoiseSVN translation status report for r23170"
Next in thread: Mike Dixon: "Re: reintegrate a branch problem"
Reply: Mike Dixon: "Re: reintegrate a branch problem"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]