I'd rather have the history. Otherwise tools like blame point only to a parent/umbrella JIRA, not the issue where the change was discussed.
We can force a merge commit so it's clear the branch was developed outside the mainline. -C On Thu, Dec 14, 2017 at 1:18 PM, Eric Yang <ey...@hortonworks.com> wrote: > +1 on squash merge to keep history compressed. The rebase + merge contains > good deals, but it is easy to get confused for people that doesn’t know about > the rebase option is turned on by default for Hadoop. > > Regards, > Eric > > On 12/14/17, 12:06 PM, "Arun Suresh" <asur...@apache.org> wrote: > > Another option - atleast for feature branches is to maybe squash merge - > this way we see it as a single commit ? Although we will loose the feature > branch history (I am ok with that though) > > Cheers > -Arun > > On Thu, Dec 14, 2017 at 11:32 AM, Eric Yang <ey...@hortonworks.com> wrote: > > > Thank you for the pointer. I guess all merge are done using rebase + > > merge. This is the reason that timeline is out of order. > > > > Would it be more useful to merge without rebasing for feature branch > merge > > to avoid timeline confusions? The argument for not rebasing, it would > be > > easier to find the root cause of trunk failure was due to merge or some > > recent commits. > > > > Regards, > > Eric > > > > From: Sunil G <sun...@apache.org> > > Date: Thursday, December 14, 2017 at 11:11 AM > > To: Eric Yang <ey...@hortonworks.com> > > Cc: Hadoop Common <common-dev@hadoop.apache.org> > > Subject: Re: Missing some trunk commit history > > > > Hi Eric. > > > > A branch merge has happened during that time, and hence you might have > > seen some old commits from that branch. If you go down further, you > could > > see those commits. > > > > Copied from my git log: > > > > commit 40b0045ebe0752cd3d1d09be00acbabdea983799 > > Author: Weiwei Yang <w...@apache.org<mailto:w...@apache.org>> > > Date: Wed Dec 6 17:52:41 2017 +0800 > > > > YARN-7610. Extend Distributed Shell to support launching job with > > opportunistic containers. Contributed by Weiwei Yang. > > > > commit 56b1ff80dd9fbcde8d21a604eff0babb3a16418f > > Author: Xiao Chen <x...@apache.org<mailto:x...@apache.org>> > > Date: Tue Dec 5 20:48:02 2017 -0800 > > > > HDFS-12872. EC Checksum broken when BlockAccessToken is enabled. > > > > commit 05c347fe51c01494ed8110f8f116a01c90205f13 > > Author: Weiwei Yang <w...@apache.org<mailto:w...@apache.org>> > > Date: Wed Dec 6 12:21:52 2017 +0800 > > > > YARN-7611. Node manager web UI should display container type in > > containers page. Contributed by Weiwei Yang. > > > > commit 73b86979d661f4ad56fcfc3a05a403dfcb2a860e > > Author: Kai Zheng > <zhengkai...@alibaba-inc.com<mailto:zhengkai.zk@alibaba- > > inc.com>> > > Date: Wed Dec 6 12:01:36 2017 +0800 > > > > HADOOP-15039. Move SemaphoredDelegatingExecutor to hadoop-common. > > Contributed by Genmao Yu > > > > commit 44b06d34a537f8b558007cc92a5d1a8e59b5d86b > > Author: Akira Ajisaka <aajis...@apache.org<mailto:aajis...@apache.org>> > > Date: Wed Dec 6 11:40:33 2017 +0900 > > > > HDFS-12889. Router UI is missing robots.txt file. Contributed by > > Bharat Viswanadham. > > > > commit 0311cf05358cd75388f48f048c44fba52ec90f00 > > Author: Wangda Tan <wan...@apache.org<mailto:wan...@apache.org>> > > Date: Tue Dec 5 13:09:49 2017 -0800 > > > > YARN-7381. Enable the configuration: > yarn.nodemanager.log-container-debug-info.enabled > > by default in yarn-default.xml. (Xuan Gong via wangda) > > > > Change-Id: I1ed58dafad5cc276eea5c0b0813cf04f57d73a87 > > > > commit 6555af81a26b0b72ec3bee7034e01f5bd84b1564 > > Author: Aaron Fabbri <fab...@apache.org<mailto:fab...@apache.org>> > > Date: Tue Dec 5 11:06:32 2017 -0800 > > > > HADOOP-14475 Metrics of S3A don't print out when enabled. > Contributed > > by Younger and Sean Mackrory. > > > > > > > > - Sunil > > > > > > On Fri, Dec 15, 2017 at 12:29 AM Eric Yang > <ey...@hortonworks.com<mailto: > > ey...@hortonworks.com>> wrote: > > Hi all, > > > > While troubleshooting a trunk build failure, I notice the commit history > > for trunk between Nov 30th to Dec 6th are squashed or disappeared for no > > reason. This seems to have taken place in the last 24 hours. I can see > > the commit logs from github UI. When doing a new clone from Apache Git > and > > Github, the commit histories between those dates are gone. I usually > > maintain two git repositories, one for testing and one for development. > > Both repositories were sync up with github frequently, and only test > > repository was updated today and the missing history only reflect in > test > > repository. This is the reason that I have the impression that this > might > > have happened in the last 24 hours. I did some spot check to see if the > > missing commits are in trunk. The code seems to be in place, and only > > commit history is gone. > > > > Is there any way to fix the commit history? Hopefully this is not a git > > bug, but some peer review might find out the root cause that could help > to > > understand the damage. Thank you > > > > Regards, > > Eric > > > > --------------------------------------------------------------------- To unsubscribe, e-mail: common-dev-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-dev-h...@hadoop.apache.org
