home
products
contribute
download
documentation
forum
Home
Forums
New posts
Search forums
What's new
New posts
All posts
Latest activity
Members
Registered members
Current visitors
Donate
Log in
Register
What's new
Search
Search
Search titles only
By:
New posts
Search forums
Search titles only
By:
Menu
Log in
Register
Navigation
Install the app
Install
More options
Contact us
Close Menu
Forums
MediaPortal 1
Development
General Development (no feature request here!)
Need Help - How to merge changes from different svn locations
Contact us
RSS
JavaScript is disabled. For a better experience, please enable JavaScript in your browser before proceeding.
You are using an out of date browser. It may not display this or other websites correctly.
You should upgrade or use an
alternative browser
.
Reply to thread
Message
<blockquote data-quote="Guzzi" data-source="post: 655524" data-attributes="member: 55213"><p>To the more experienced devs:</p><p></p><p>I want to merge changes from different svn locations and don't know how to do that.</p><p></p><p>History:</p><p>- In april I loaded an svn version of a plugin locally</p><p>- I created a local SVN on my dev PC</p><p>- I checked in this downloaded version as "inital version"</p><p>- I made lot's of changes - now being at revision "49"</p><p>- In between the original author checked in an updated revision of the code</p><p></p><p>So now I have local updates and an update in sourcefourge svn.</p><p></p><p>What I want to do is merge the sourceforgechanges into my local code (my local code is not yet good enough to check it in sourceforge i think ....)</p><p></p><p>So I would assume I need to create a unified patch file from sourceforge for the latest update and import that one locally against latest revision49 ?</p><p></p><p>I don't see the way how to do that - can any experienced user point me into the right direction?</p><p></p><p>Thanks, Guzzi</p></blockquote><p></p>
[QUOTE="Guzzi, post: 655524, member: 55213"] To the more experienced devs: I want to merge changes from different svn locations and don't know how to do that. History: - In april I loaded an svn version of a plugin locally - I created a local SVN on my dev PC - I checked in this downloaded version as "inital version" - I made lot's of changes - now being at revision "49" - In between the original author checked in an updated revision of the code So now I have local updates and an update in sourcefourge svn. What I want to do is merge the sourceforgechanges into my local code (my local code is not yet good enough to check it in sourceforge i think ....) So I would assume I need to create a unified patch file from sourceforge for the latest update and import that one locally against latest revision49 ? I don't see the way how to do that - can any experienced user point me into the right direction? Thanks, Guzzi [/QUOTE]
Insert quotes…
Verification
Post reply
Forums
MediaPortal 1
Development
General Development (no feature request here!)
Need Help - How to merge changes from different svn locations
Contact us
RSS
Top
Bottom