Re: svn merge and svnmerge - quick question.

2013-04-22 Thread Johan Corveleyn
On Mon, Apr 22, 2013 at 5:11 AM, Z W wrote: > Hi All > > We have 1.6 SVN. > > Can svnmerge.py and svn merge be used on the same working copy directory for > merging from trunk to branch ? I have no experience with svnmerge.py, but I wouldn't really recommend it. AFAIU they will not know about eac

svn merge and svnmerge - quick question.

2013-04-21 Thread Z W
Hi All We have 1.6 SVN. Can svnmerge.py and svn merge be used on the same working copy directory for merging from trunk to branch ? Thanks