On Mon, Apr 22, 2013 at 5:11 AM, Z W <mpc8...@gmail.com> 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 each other's merging, so they won't know what has already been merged by the other tool and what not. But if you don't really care about this "cross-tool merge tracking", I suppose it can work. -- Johan
