Re: [BUG] Borked 1.5.x CHANGES merging

On Sat, Apr 12, 2008 at 2:22 AM, David Glasser <glasser_at_davidglasser.net> wrote:
> I say this because with a clean 1.5.x checkout at r30560 and a clean
> trunk svn from the same revision, I just get:
>
> glasser_at_filthy-assistant:~/Projects/Subversion/svn-1.5.x$ svn merge
>
> --accept theirs-full http://svn.collab.net/repos/svn/trunk/CHANGES
> CHANGES
> --- Merging r1283 through r30560 into 'CHANGES':
> G CHANGES
>
> ... on the other hand, it appears to do nothing, not even change mergeinfo.

We went through similar issues a couple weeks ago with Julian. The
problem was that his 1.5.x branch was checked out before we updated to
1.5 and "cleaned" the repository. If you recall, all WC's needed to
be re-checked out once we did that. CHANGES should not have any
mergeinfo on it.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org