Re: [boost] Help with SVN required

Subject: Re: [boost] Help with SVN required
From: Steven Watanabe (watanabesj_at_[hidden])
Date: 2009-08-01 18:55:06

AMDG

Robert Ramey wrote:
> Steven Watanabe wrote:
>   
>> If you just want to completely overwrite the release branch
>> with the contents of the trunk, you can pass the release branch
>> and the trunk as the two sources for the merge.
>>     
>
> I tried this by selection the third option from the merge dialog.  However
> I got other behavior which doesn't seem right.
>
> a) No conflicts - according to Tortoise SVN so far so good.
> b) A couple of files which have been dropped are now marked
> as conflicted - not what I expect to see.  So the file system on
> my working directory doesn't look like the on on the thunk.
> I suppose I could remove them with svn commands - but that
> seems contrary to the whole idea of the "merge"
> c) a couple of new files I added to the trunk don't show up
> in the file system.
> d) The files aren't the same as in the trunk - they look like
> a "merge" of the trunk and release branches - which is not what
> I want.
> e) The little Tortoise icon overlay shows a green dot which
> is supposed to indicate that the file in the working directory
> is the same as that in the supository.  This is a surprise to
> me as I expect the working directory to contain files which
> are now different than the current branch - the release branch.
> When I right click - it doesn't give me a choice to diff with the
> repository but rathre to diff against the previous version.
>
> Note that I "upgraded" to the most most recent revision of tortoise SVN- 
> 1.63
> which has UI Dialogs which differ from those described in 
> https://svn.boost.org/trac/boost/wiki/ImprovingPractices
>
> I'm still searching around - it drives me crazy when something
> that should be trivial takes a whole day.
>   

I don't know what the equivalent in Tortoise SVN is,
but using the command line client the following
works:

svn merge 
https://svn.boost.org/svn/boost/branches/release/boost/serialization 
https://svn.boost.org/svn/boost/trunk/boost/serialization 
boost/serialization

In Christ,
Steven Watanabe