Thank you mike, it's very helpful. I will give it a shot.
I have the same suspect it may caused by inappropriate optimization made by SVN when doing the merging. but I had almost none experiences working directly with SVN( I know few SVN script and currently under tight development schedule ) so I will describe it by words to SVN.
> On 8/13/2012 1:35 AM, eddie lu wrote:
> > 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?
> >
>
> I've seen this too; basically it skips adding mergeinfo on your branch
> for (from your example) r100 and r101, probably because it goes "oh,
> these cancel each other out, so there's nothing to do" and then the
> missing mergeinfo entries causes the reintegrate error.
>
> You can work around it by doing a record-only merge of those two
> revisions to your branch and committing that. After that the reintegrate
> merge to trunk should work OK.
>
> I suspect this is probably a bug with the underlying svn library rather
> than tsvn itself. If you'd like to help to get it fixed, your best bet
> is probably to put together a simple script demonstrating the problem
> with just the command-line svn client, and then to send that to
> users at subversion dot apache dot org.
>
> -Mike
Thank you mike, it's very helpful. I will give it a shot.
I have the same suspect it may caused by inappropriate optimization made by SVN when doing the merging. but I had almost none experiences working directly with SVN( I know few SVN script and currently under tight development schedule ) so I will describe it by words to SVN.
-Lu
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2998309
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-08-14 04:25:10 CEST