[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 15 May 2009 22:42:01 +0200

Todd C. Gleason wrote:
>> -----Original Message-----
>> From: Stefan Küng [mailto:tortoisesvn_at_gmail.com]
>> Sent: Friday, May 15, 2009 10:08 AM
>> To: users_at_tortoisesvn.tigris.org
>> Subject: Re: Merge "Out of date" problem
>>
>> Todd C. Gleason wrote:
>>
>>>> Have you checked the FAQ?
>>>> http://subversion.tigris.org/faq.html#wc-out-of-date
>>> That's the very URL I cited in the message above. I have included
>>> your instructions, added to them, and referenced the original in my
>>> wiki. And if you look at my use case, there is no failed commit, no
>>> opportunity for mixed revisions, and in most cases I am not
>>> out-of-date because when I do the "extra" svn update it doesn't
>>> actually say that anything was updated...but tells me the same
>> If you read the FAQ you should know that you still can have an
>> out-of-date working copy. Even if all commits are fine and update
>> doesn't show anything as updated: such an update still udpates the
>> revisions of folders.
>
> Except I had already done an update since committing--see below.
>
>>> revision it was already at from the svn update prior to the merge.
>>> For example:
>>>
>>> Svn update -> rev. 1000 Svn merge from branch Svn commit: failure
>>> Svn update -> rev. 1000 Svn commit: succeed
>> Exactly! Please read the FAQ again (the part about "mixed revisions").
>
> 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.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2274467
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-05-15 22:42:22 CEST

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