[Svnmerge] [PATCH] Not depegging correctly

[Blair Zajac]

Giovanni Bajo wrote:
> Blair Zajac <blair at orcaware.com> wrote:
> 
> 
>>>Without it, if I'm in a branch that has itself and the trunk in the
>>>svnmerge-integrated property, then it won't remove the branch from the
>>>list of potential sources because it's looking to remove the repository
>>>local path with the peg revision.
> 
> 
> The idea was to keep the pegrev within the svnmerge property. If you run
> svnmerge init with latest svnmerge, it does store the pegrev in there. So
> what should be actually done is *add* the pegrev to an svnmerge property not
> yet updated. So the patch is conceptually wrong.
> 
> As I said before, this is really experimental. There are strong issues at
> the moment: for instance, there is no way with svn (command line at least)
> to know if URL1 at NN and URL2 at MM are actually the same file in different
> points of history. Main problem here is that "svn log URL" does not accept
> pegrevs, which is really a show-stopper with all this pegrev stuff in
> svnmerge. If you could work on this for SVN 1.4 it'd be great.
> 
> In other words, please ignore these pegrevs issues, and produce patches
> against svn.collab.net. I'm really sorry I didn't say this before and Raman
> did his work against my repository, but official work should now be done on
> svn.collab.net directly.

Thanks for pointing that out.

I think the only thing to remove from Raman's patch is the call to depeg().  But 
I'll take another look.

Regards,
Blair

-- 
Blair Zajac, Ph.D.
<blair at orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/