[Buildbot-commits] [SPAM] Re: [Buildbot] #467: SVN - allow multiple repositories

[Buildbot]

#467: SVN - allow multiple repositories
--------------------------------+-------------------------------------------
Reporter:  ipv6guru             |        Owner:  mue     
    Type:  enhancement          |       Status:  assigned
Priority:  major                |    Milestone:  0.8.+   
 Version:  0.7.10               |   Resolution:          
Keywords:  sourceforge 1685062  |  
--------------------------------+-------------------------------------------

Comment(by marcusl):

 You can always merge the master branch to your branch, and resolve any
 conflicts. That would make it up to date. (If there are too many
 conflicts, some intermediate merges might help, if you can identify some
 good spots in the history to merge with.)

 In order to make the history look good, one would need to rebase, but I
 find that hard when there's many conflicts (however, I'm no git
 expert...).

 After merge, one could export the diff to master as a patch and then
 create a new commit with that patch, then ignore/scrap the merge and old
 commits.

-- 
Ticket URL: <http://buildbot.net/trac/ticket/467#comment:19>
Buildbot <http://buildbot.net/>
Buildbot: build/test automation