On Wed, 2007-10-03 at 22:49 +0200, Erik Huelsmann wrote:
> On 10/3/07, Jonathan Ashley <jonathan.ashley@praxis-his.com> wrote:
> > I don't think you are overlooking anything. I was baffled by unexpected
> > Replacements and eventually tracked it down to the same thing: if a
> > directory
> > is added on a branch and the branch then merged back on to the trunk,
> > the
> > new directory appears on the trunk flagged as 'A', but the contents are
> > flagged as 'R'.
> >
> > I found your post when looking to see if anyone had reported a similar
> > problem. I would guess there's a good reason for the behaviour -
> > probably
> > reflects the way it is implemented internally - but it is certainly
> > confusing
> > (and undocumented).
>
> It's certainly an exponent of how it's implemented, but certainly not
> how it should have been implemented. However, given how merge (and the
> resulting commit) are -currently- implemented, it's reported as 'R'
> instead of 'A'. I hope to fix this some time before 1.6, but that's
> some time away, since 1.5 is still to be released...
Thanks, Erik. Even if less than ideal it is good to know SVN is working
as coded, and that I did not completely screw up my merge.
--
----------------------
Mark S. Reibert, Ph.D.
mark@reibert.com
----------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 9 07:00:59 2007