[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: Wed, 20 May 2009 21:40:40 +0200

Todd C. Gleason wrote:

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

A revert also contacts the repository, since it has to tell the
repository to loose all the mergeinfo (in case you revert a merge). That
of course could lead to 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=2334438
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-05-20 21:41:10 CEST

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