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

svn merge --record-only, svn merges - how to use - quick question

2013-04-21 Thread Z W
Hi All How does one use --record-only option with svn merge ? Is it used when a revision number is found in svn mergeinfo eligible list and returns no changes ? ie eg r234455 is on the eligible list but when applied with svn merge, there's no change. Is that when we use --record-only option after