Le 19/09/12 11:06, Daniel James a écrit :
On 18 September 2012 23:57, Vicente J. Botet Escriba <vicente.botet@wanadoo.fr> wrote:
Hi,
I have tried to merge (https://svn.boost.org/trac/boost/changeset/80051) Boost.DateTime from trunk to release to merge and I suspect that the svn merge tools has not been used since a long time. I'm getting a long diff with a lot of mergeinfo. What merge command are you using? $$ pwd /Users/viboes/boost/rel/boost/date_time $$ svn merge --accept theirs-full /Users/viboes/boost/trunk/boost/date_time
Property changes on: boost/date_time/gregorian_calendar.ipp This is normally caused because other people have previously merged directly to files causing them to contain a large amount of messy metadata. It's annoying, but doesn't mean there's a problem with your merge. Concerning the actual release, only changes to source code really matter.
OK, I see. Vicente