Re: Failing to --reintegrate branch

Sorry if I seem to be talking to myself, but a bit more info.

http://www.svnforum.org/2017/viewtopic.php?t=6718&sid=170a806789d3c6cab16df296906dbf6c

suggests removing all properties except ".". So looking at:

    $ svn propget svn:mergeinfo --depth=infinity | wc -l
    53

I see these versions:

The root (".") has 2601-2639
The bulk of those 53 mergeinfo properties have the range: 2606-2639
And two other files have 2620-2639

Can I just ignore those differences and

    svn propdel svn:mergeinfo <path>

for every <path> except "."?

Once I delete all those properties, I checkin on the branch and move
to an updated trunk working copy (or switch to trunk) and then

    svn merge --reintegrate <url for branch>

I also looked at this (in my trunk working copy:

    svn diff <url of trunk> <url of branch>

And I do see quite a bit of things like:

Property changes on: root/static/source/js/js_lib/Button.js
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/Project/root/static/source/js/js_lib/Button.js:r2606-2637

Does that mean if I do a svn merge <url of trunk> <url branch> that
I'd end up with mergeinfo properties in trunk?

-- 
Bill Moseley
moseley_at_hank.org
Sent from my iMutt
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org