Alternative: *delete* master branch, them fork maint as master. (Or, as noted, fork it as main.) That would preserve history, since maint has its own copy of that data.
There's nothing really special about main/master branch except the naming convention. -- /_ Joe Kesselman (he/him/his) -/ _) My Alexa skill for New Music/New Sounds fans: / https://www.amazon.com/dp/B09WJ3H657/ () Plaintext Ribbon Campaign /\ Stamp out HTML mail! ________________________________ From: Mukul Gandhi <muk...@apache.org> Sent: Friday, June 16, 2023 1:12:02 PM To: dev@xalan.apache.org <dev@xalan.apache.org> Subject: Re: Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits Hi Vladimir, On Fri, Jun 16, 2023 at 9:52 PM Vladimir Sitnikov <sitnikov.vladi...@gmail.com> wrote: > > https://github.com/apache/xalan-java/blame/master/src/org/apache/xalan/xsltc/compiler/DocumentCall.java > > https://github.com/apache/xalan-java/blame/xalan-j_2_7_1_maint/src/org/apache/xalan/xsltc/compiler/DocumentCall.java After XalanJ 2.7.3 release was made and announced from the branch xalan-j_2_7_1_maint, it was suggested by XalanJ team, to merge the codebase changes from the branch xalan-j_2_7_1_maint to master. I think Ideally, that codebase merge should've been done either for e.g by "git merge" command or manually. Neither of these two ways was easily possible, since the currently active Xalan team members didn't knew deeply about the earlier XalanJ codebase history due to which chances of git codebase merge errors was possible. To overcome this hurdle, we followed the below mentioned process, to merge codebase changes from branch xalan-j_2_7_1_maint to master (and similarly for xalan-test repos as well), 1) The local workspace has branch master's codebase. Delete all of this codebase from this local workspace and make a codebase commit to repos. 2) Copy all the codebase from branch xalan-j_2_7_1_maint to master branch's local, and make a commit to repos. I think, due to the above codebase merge process that we followed, you're seeing issues with git blame command. But that's not a significant issue I guess, with XalanJ's current codebase. The XalanJ's current master branch codebase is exact replica of branch xalan-j_2_7_1_maint (for xalan-java repos). Since we, did extensive testing of XalanJ codebase before making 2.7.3 release and also had so many RCs in the process, I feel implementation quality of XalanJ 2.7.3 and the corresponding codebase on repos as of now is nice. I do think that, for XalanJ future releases, we should merge codebase properly (if codebase merge between XalanJ repos branches shall be needed) and not the way we did after 2.7.3 release. -- Regards, Mukul Gandhi --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@xalan.apache.org For additional commands, e-mail: dev-h...@xalan.apache.org
