[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: More svn merge testing

From: David Glasser <glasser_at_davidglasser.net>
Date: 2007-10-19 20:24:08 CEST

On 10/16/07, Troy Curtis Jr <troycurtisjr@gmail.com> wrote:
> Ok so I've come up with something else about the svn merge output.
> Here is my test procedure (note that I am doing this from my hacked on
> version of the merge-tracking sample repo).
>
> * svn cp -r 8 //trunk //branches/f
> (commited r27)
> * In //branches/f working copy:
> * cd products
> * svn merge -g && svn ci (pretty much grabs r14, including adding
> a file: roadmap.html)
> * cd ..
> * svn merge -g -c 14
> A products/roadmap.html
> U about/index.html
> U index.html
> U news/index.html
> G .
> * svn st
> M .
> M about/index.html
> M index.html
> M news/index.html
>
> So it makes since that after all the merging the roadmap.html was already
> present and therefore had no modifications. I just thought that it maybe
> shouldn't show up as an "add" in the merge output. Might be a little
> confusing.

Is this the same thing being discussed in the thread
"Incorrect/confusing merge notification"?

--dave

-- 
David Glasser | glasser_at_davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 19 20:24:20 2007

This is an archived mail posted to the Subversion Dev mailing list.