You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Troy Curtis Jr <tr...@gmail.com> on 2007/10/17 04:05:52 UTC
More svn merge testing
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.
Troy
--
Beware of spyware. If you can, use the Firefox browser. - USA Today
Download now at http://getfirefox.com
Registered Linux User #354814 ( http://counter.li.org/)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: More svn merge testing
Posted by Troy Curtis Jr <tr...@gmail.com>.
On 10/19/07, David Glasser <gl...@davidglasser.net> wrote:
> On 10/16/07, Troy Curtis Jr <tr...@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@davidglasser.net | http://www.davidglasser.net/
>
Yep it does appear to be the same. I didn't notice that other thread.
--
"Beware of spyware. If you can, use the Firefox browser." - USA Today
Download now at http://getfirefox.com
Registered Linux User #354814 ( http://counter.li.org/)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: More svn merge testing
Posted by David Glasser <gl...@davidglasser.net>.
On 10/16/07, Troy Curtis Jr <tr...@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@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