[tor-bugs] #11271 [Obfsproxy]: ScrambleSuit and obfsproxy repositories should be merged

[Tor Bug Tracker & Wiki]

#11271: ScrambleSuit and obfsproxy repositories should be merged
-----------------------------+-------------------------------
     Reporter:  phw          |      Owner:  phw
         Type:  enhancement  |     Status:  new
     Priority:  normal       |  Milestone:
    Component:  Obfsproxy    |    Version:
   Resolution:               |   Keywords:  scramblesuit, git
Actual Points:               |  Parent ID:
       Points:               |
-----------------------------+-------------------------------

Comment (by phw):

 I think there are two ways to do this.

  1. We could rebase all existing ScrambleSuit commits out of the obfsproxy
 repository and then merge ScrambleSuit's repository as subtree as outlined
 on this page: http://git-scm.com/book/ch6-7.html.  While that would result
 in a clean git history, it would mean rewriting a public repository which
 is  bad practice and everybody who has unmerged obfsproxy branches will
 hate us.
  1. On the other hand, we could first remove all existing ScrambleSuit
 commits (by doing `git rm` instead of a rebase) and then proceed with the
 subtree merge.  That way, we would avoid future merge conflicts but the
 git history would be messy.

 I would prefer the second option unless there are more options I didn't
 think about?

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/11271#comment:2>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online