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

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?


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

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

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