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

RE: Merge "Out of date" problem

From: Todd C. Gleason <tgleason_at_impac.com>
Date: Tue, 19 May 2009 11:56:15 -0700

> -----Original Message-----
> From: Todd C. Gleason [mailto:tgleason_at_impac.com]
> Sent: Friday, May 15, 2009 2:49 PM
> To: users_at_tortoisesvn.tigris.org
> Subject: RE: Merge "Out of date" problem
>
> > -----Original Message-----
> > From: Stefan Küng [mailto:tortoisesvn_at_gmail.com]
> > Sent: Friday, May 15, 2009 2:42 PM
> > To: users_at_tortoisesvn.tigris.org
> > Subject: Re: Merge "Out of date" problem
> >
> > > I have re-read it a few times and I still do not see how it covers my
> > case as written. Note again the order of my operations:
> > >
> > > Svn update -> rev. 1000
> > >
> > > -- At this point, there should be no "mixed revisions", correct?
> > >
> > > Svn merge from branch
> > >
> > > -- So now are there mixed revisions? The FAQ says commits may cause
> > mixed revisions. It does not say other operations such as merges may do
> > this. If merges give you mixed revisions, it would help to explain that
> > in the FAQ, because I would expect that "mixed revisions" applies to
> your
> > working base, and that merging leaves your working base alone and only
> > changes your working copy. (I hope I got the terminology correct
> there.)
> > >
> > > Svn commit: failure
> > >
> > > -- At this point, svn has failed for me. The only operation I have
> done
> > since updating is a merge, so presumably the merge must be the source of
> > the trouble. I just, again, don't see any explanation for this in the
> > FAQ.
> > >
> > > Svn update -> rev. 1000
> > > Svn commit: succeed
> > >
> > > -- So yes, the instructions for dealing with mixed revisions solved
> the
> > problem, they just do not seem to apply as they are currently written.
> >
> > Hmm - you should report this on the Subversion mailing list.
>
> I probably need to come up with an exact repro recipe for this in order to
> be taken seriously. I am guessing that it has to do with having subtree
> mergeinfo (being as that's one of the few possible oddities I can see in
> my WC), and I don't know how easy it will be for me to set that up,
> so...haven't done so yet.

Something else occurred to me. I guess my use case is more like this:

Svn update -> rev. 1000
Svn merge from branch
Go to TSvn commit window, and revert all the prop changes for subtree mergeinfo (this can be over a hundred at this point)
Svn commit: failure
Svn update -> rev. 1000
Svn commit: succeed

Can the revert step on the prop changes cause mixed revisions somehow? You'd think it should only revert back to the same working BASE version as the rest of my WC (rev. 1000 above) but I wonder if something is going wrong here.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-05-19 21:05:17 CEST

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