git - Can I generate patch off private commit and send it to maintainer? -

-

in progit says:

if want git try bit more intelligently resolve conflict, can pass -3 option it, makes git attempt three-way merge. option isn’t on default because doesn’t work if commit patch says based on isn’t in repository. if have commit — if patch based on public commit — -3 option smarter applying conflicting patch:

and

the other advantage of approach history of commits well. although may have legitimate merge issues, know in history work based; proper three-way merge default rather having supply -3 , hope patch generated off public commit have access.

so mean can base patch on private commit? wonder sense make lead obvious conflicts while merging because files in commit patch based on on contributor's side differ how files now, how can incorporate them? these things described in progit project maintainer's point of view it's not case contributor base patch on development secret branch.

a change can based off private commit, , apply long changes nonconflicting.

consider:

a                   master \--------b-----c    head

a upstream (public) master; b , c commits private branch. can generate patch b c , if a..b , b..c nonconflicting apply upstream public commit a.

the more polite thing reorder commits:

a                   master \--------c-----b    head

and submit patch a..c. if isn't possible (say, because intermediate stage commits have been published locally) should able cherry-pick commits branch dedicated preparing patches upstream submission:

a                   master \--------b-----c    head \--------c'         upstream-request

Comments

Post a Comment

Popular posts from this blog

c# - SVN Error : "svnadmin: E205000: Too many arguments" -

-
i trying reposotries using c# code process svncommand = null; var psi = new processstartinfo("svnadmin"); psi.redirectstandardoutput = true; psi.redirectstandarderror = true; psi.useshellexecute = false; psi.arguments= @"dump c:\repositories\myrepo > c:\temp\myrepodumpfile.dump"; using (svncommand = process.start(psi)) { var myoutput = svncommand.standardoutput; var myerror = svncommand.standarderror; debug.write("output :" + environment.newline + environment.newline + myoutput.readtoend() + environment.newline + "error :" + environment.newline + environment.newline + myerror.readtoend()); svncommand.close(); } when use dump command commandline svnadmin dump c:\repositories\myrepo > c:\temp\myrepodumpfile.dump it works fine when try ...
Read more

c++ - Using OpenSSL in a multi-threaded application -

-
i have been writing soap client application in c++ on ubuntu using openssl https transport , pthreads threading. have number of threads - 1 central data acquisition thread periodically gets worker threads make soap requests via shared mutex protected queues. reading documentation openssl found is openssl thread-safe? in openssl faq describes mechanisms required ensure thread safety when using openssl. implemented , works fine. the reason question conceptual difficulty really. thinking implementing same functionality application has already, instead of using threads, create 2 seperate applications : 1 worker thread (of multiple copies running) , main data acquisition thread. use tcp sockets communicate between 2 rather mutex protected queues. may bad idea not important - confusing me would have implement same functions required ensure openssl thread safety in second approach or not? my guess not have , treated independent (indeed surely must many applications use openssl) re...
Read more

All overlapping substrings matching a java regex -

-
is there api method returns (possibly overlapping) substrings match regular expression? for example, have text string: string t = 04/31 412-555-1235; , , have pattern: pattern p = new pattern("\\d\\d+"); matches strings of 2 or more characters. the matches are: 04, 31, 412, 555, 1235. how overlapping matches? i want code return: 04, 31, 41, 412, 12, 55, 555, 55, 12, 123, 1235, 23, 235, 35. theoretically should possible -- there obvious o(n^2) algorithm enumerates , checks substrings against pattern. edit rather enumerating substrings, safer use region(int start, int end) method in matcher . checking pattern against separate, extracted substring might change result of match (e.g. if there non-capturing group or word boundary check @ start/end of pattern). edit 2 actually, it's unclear whether region() expect zero-width matches. specification vague, , experiments yield disappointing results. for example: string line = "xx90xx"; strin...
Read more