On 11/3/06, tom@limepepper.co.uk <tom@limepepper.co.uk> wrote:
>
> Hi,
>
> If I do a merge of the difference between the HEAD and an earlier
> revision like so;
>
> /usr/bin/svn -r 40:11 http://server/repos/staticwebsite1/trunk .
>
> The changes are applied to the working copy, but the working copy
> still thinks that it is at revision 40. so "svn info ." returns
> "Revision 40", is this supposed to happen, as now I get lots of
> conflicts when working with the working copy.
Ofcourse: you asked svn to take all changes between r11 and r40 and
remove them from your working copy. Which is not the same as 'svn up
-r 11' which says: change my working copy to reflect the repository
state in r11.
If you do 'svn up -r 11', you're not likely to be able to commit any
changes (most files will be superseded by commits that took place
between r11 and r40). But with the merge command, you will be able to
commit: the working copy still is at r40, you just locally removed a
number of changes.
/me hopes this is clear...
bye,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 3 14:30:58 2006