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

More svn merge testing

From: Troy Curtis Jr <troycurtisjr_at_gmail.com>
Date: 2007-10-17 06:05:52 CEST

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
Received on Wed Oct 17 06:06:05 2007

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