How to merge files from svn to rtc
Hi,
My team is working on an open source project which source control software is svn, we need merge open source code every week, we use cs svn before and it is easy to merge such code from svn to svn.
But now we have RTC, RTC is not svn, we find no way to do the merge, besides only checkout the different files and then check-in to RTC, it waste much time to do this...
Could anyone give us a method on how to merge files from svn to rtc??
Your comments are welcome, thanks in advanced!
My team is working on an open source project which source control software is svn, we need merge open source code every week, we use cs svn before and it is easy to merge such code from svn to svn.
But now we have RTC, RTC is not svn, we find no way to do the merge, besides only checkout the different files and then check-in to RTC, it waste much time to do this...
Could anyone give us a method on how to merge files from svn to rtc??
Your comments are welcome, thanks in advanced!
2 answers
You could do this using the SVN import capability. You would need to keep a workspace that matched the previous state that you imported from SVN. You could perform a new import starting at the revision after the last import to get that workspace up-to-date with SVN. You could then accept those changes into another workspace that contained nay changes made outside of svn and perform any required merging. Here's a wiki page that describes the SVN importer:
https://jazz.net/wiki/bin/view/Main/SCMImport
https://jazz.net/wiki/bin/view/Main/SCMImport