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.

> 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").

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=2272387
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].