[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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

#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 asn):

 As an example of what I said in my previous comment, see my branch
 `scramblesuit_merge` in
 `https://git.torproject.org/user/asn/obfsproxy.git`.

 It merges all scramblesuit commits from `d4e0d46` to `a9ce128`. My tactic
 was to export all those commits as patches, use some regexps to change the
 paths, and commit everything that applies cleanly. Stuff that doesn't
 apply cleanly I made new commits for.

 Specifically, any commit that changed the ChangeLog or the unittests did
 not apply cleanly. The unittests commits did not apply because of
 different import paths etc. I manually commited the unittest changes.

 Unittests seem to run fine, and integration tests too. I haven't done
 further testing.

 I would also like to squash some commits together before merging to master
 since there is too much noise.

 Any comments? You think this is a reasonable approach?


 Currently all unittests pass and the integration tests seem to work. I
 haven't done further testing.

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/11271#comment:4>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
_______________________________________________
tor-bugs mailing list
tor-bugs@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs