Thanks Colm and Jiajia for the discussion. Not only that, it's also convenient for relevant discussion. When we say something like "sync with trunk", it would really mean the 'trunk' branch, instead of the other one like 'master'. Note, probably it's because we're old guys from SVN experience.
If we can't solve the issue found by Colm, we may again ask for help from ASF INFRA team. Regards, Kai -----Original Message----- From: Li, Jiajia [mailto:[email protected]] Sent: Wednesday, January 06, 2016 9:39 AM To: [email protected]; [email protected] Subject: RE: Rename master branch to trunk and create 1.0.0-RC2 branch for the upcoming release Hi Colm, Thank you to catch this issue, the default branch is still "master" after 'git clone', we should try to solve this problem. I think the reason of renaming to "trunk" is because of the "trunk" is used more than "master" in other projects, such as "Hadoop". Thanks Jiajia -----Original Message----- From: Colm O hEigeartaigh [mailto:[email protected]] Sent: Tuesday, January 05, 2016 7:39 PM To: [email protected] Subject: Re: Rename master branch to trunk and create 1.0.0-RC2 branch for the upcoming release Is this really working? I just did a "git clone https://git-wip-us.apache.org/repos/asf/directory-kerby.git";, and the default branch was still "master". I had to explicitly do a "git checkout trunk". I'm a bit late with this comment, but I'm not sure why this change was necessary, as I don't see how users could be confused with a branch called "master", as it's the default for git. Colm. -- Colm O hEigeartaigh Talend Community Coder http://coders.talend.com On Mon, Dec 28, 2015 at 1:12 AM, Zheng, Kai <[email protected]> wrote: > Hi, > > I'd suggest we use 'trunk' instead of 'master' to name the trunk > branch as mostly often seen in other projects. It will be easier > understood by new comers. > Meanwhile, I'll update pom.xml files to use the version like > '2.0.0-SNAPSHOT' for the trunk branch, and create a branch like > 'branch-1.0.0-RC2' using the current version '1.0.0-RC2-SNAPSHOT' for > the upcoming release. I thought every release should cut its own > branch, though unfortunately we don't have one for the past RC1 release. > > If no objection, I'll proceed today late. And after that, I'll do some > cleanup and move some codes out of the 'branch-1.0.0-RC2' branch to > prepare for the release. > > Regards, > Kai > -- Colm O hEigeartaigh Talend Community Coder http://coders.talend.com
