On Wed, 2017-05-24 at 11:51 +0200, Michael Osipov wrote: > > Hi Oleg, > > > > I'm sure we need no noise at all but I could not figure out how to > > clean it > > up. > > > > I do know that got one cherry-picked commit right for one of the > > tickets. > > > > For the other, I could not get rid of the merge commits. > > If you can't merge properly, please ask for help before merging to > upstream. > You produce merge commits because your branch has not been rebased on > top of > master. >
Gary Based on Michael's proposal merging dev branches to release branches becomes RM's (my) job. Stop worrying about merges for now and worry more about building things in dev branches. Michael, Is there anything holding back the vote? Oleg > > On Wed, May 24, 2017 at 1:37 AM, Oleg Kalnichevski > > <ol...@apache.org> wrote: > > > > > Gary > > > > > > You latest commits to the repo produced the following history: > > > > > > --- > > > d0b0cfab3 HTTPCORE-471: Add APIs URIBuilder.localhost() and > > > setHost(InetAddress) > > > c30d60875 Merge branch 'master' of https://git-wip-us.apache.org/ > > > repos/ > > > asf/httpcomponents-core.git > > > 907d67637 [HTTPCLIENT-1852] Add APIs URIBuilder.localhost() > > > loopbackAddress() and setHost(InetAddress). > > > 257b251b3 Fix typos in examples. > > > 69863fd56 [HTTPCORE-468] > > > 173d8422e Merge branch 'master' of https://git-wip-us.apache.org/ > > > repos/ > > > asf/httpcomponents-core.git > > > 47c02ac66 [HTTPCLIENT-1852] Add APIs URIBuilder.localhost() > > > loopbackAddress() and setHost(InetAddress). > > > 33d26c3c2 Fix typos in examples. > > > c96d1adab [HTTPCORE-468] > > > 4195288ed Fix typos in examples. > > > 28cfcce90 Merge branch 'dev/5.0.x/HTTPCORE-468' > > > 8374fec65 [HTTPCORE-468] > > > 9ec06ec64 Line ending normalization > > > --- > > > > > > The same stuff got merged in multiple times from multiple > > > branches. > > > > > > Do we really need all this noise? > > > > > > I reorganized the same commits with zero diff (no functional > > > changes) > > > producing the following history: > > > > > > --- > > > 7d518b5f6 HTTPCORE-471: Add APIs URIBuilder.localhost() and > > > setHost(InetAddress) > > > bf8d50fcc Fix typos in examples. > > > c8a110db0 [HTTPCORE-468] > > > 9ec06ec64 Line ending normalization > > > --- > > > > > > Please have a look. Again, do we really need all this noise? > > > > > > Oleg > > > > > > > > > --------------------------------------------------------------- > > > ------ > > > To unsubscribe, e-mail: dev-unsubscr...@hc.apache.org > > > For additional commands, e-mail: dev-h...@hc.apache.org > > > > > > > > > > > > -- > > E-Mail: garydgreg...@gmail.com | ggreg...@apache.org > > Java Persistence with Hibernate, Second Edition > > <https://www.amazon.com/gp/product/1617290459/ref=as_li_tl?ie=UTF8&; > > camp=1789&creative=9325&creativeASIN=1617290459&linkCode=as2&tag=ga > > rygregory-20&linkId=cadb800f39946ec62ea2b1af9fe6a2b8> > > > > <http:////ir-na.amazon-adsystem.com/e/ir?t=garygregory- > > 20&l=am2&o=1&a=1617290459> > > JUnit in Action, Second Edition > > <https://www.amazon.com/gp/product/1935182021/ref=as_li_tl?ie=UTF8&; > > camp=1789&creative=9325&creativeASIN=1935182021&linkCode=as2&tag=ga > > rygregory-20&linkId=31ecd1f6b6d1eaf8886ac902a24de418%22> > > > > <http:////ir-na.amazon-adsystem.com/e/ir?t=garygregory- > > 20&l=am2&o=1&a=1935182021> > > Spring Batch in Action > > <https://www.amazon.com/gp/product/1935182951/ref=as_li_tl?ie=UTF8&; > > camp=1789&creative=9325&creativeASIN=1935182951&linkCode=%7B%7Blink > > Code%7D%7D&tag=garygregory- > > 20&linkId=%7B%7Blink_id%7D%7D%22%3ESpring+Batch+in+Action> > > <http:////ir-na.amazon-adsystem.com/e/ir?t=garygregory- > > 20&l=am2&o=1&a=1935182951> > > Blog: http://garygregory.wordpress.com > > Home: http://garygregory.com/ > > Tweet! http://twitter.com/GaryGregory > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@hc.apache.org > For additional commands, e-mail: dev-h...@hc.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@hc.apache.org For additional commands, e-mail: dev-h...@hc.apache.org
