[
https://issues.apache.org/jira/browse/XALANJ-2671?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17739306#comment-17739306
]
Stanimir Stamenkov commented on XALANJ-2671:
--------------------------------------------
bq. It does encourage bad practices though...
My suggestion adheres to the good practice of "never force push on master".
bq. I would suggest just removing the bad commits from the history as removing
them it trivial...
Supposing master history is (hard) reset to
[{{ff6743972a31}}|https://github.com/apache/xalan-java/commit/ff6743972a311e2c69423a8821600332937826c4]
(the parent of
[{{0affa12bb12e}}|https://github.com/apache/xalan-java/commit/0affa12bb12e45bf681a6e6a918d68884d7e1877])
– what's your suggestion for "resetting master from xalan-j_2_7_1_maint" then:
* Perform a merge from "xalan-j_2_7_1_maint" into "master"; or
* Hard reset "master" to "xalan-j_2_7_1_maint"?
With the latter, it would be nice to get an archived branch or just tag (f.e.
{{master-20230701}}) saving the current state for historical reference.
> Source code history lost in "clearing all contents" + "updating master
> branch, to have same contents as..." commits
> -------------------------------------------------------------------------------------------------------------------
>
> Key: XALANJ-2671
> URL: https://issues.apache.org/jira/browse/XALANJ-2671
> Project: XalanJ2
> Issue Type: Bug
> Security Level: No security risk; visible to anyone(Ordinary problems in
> Xalan projects. Anybody can view the issue.)
> Reporter: Vladimir Sitnikov
> Assignee: Gary D. Gregory
> Priority: Critical
>
> I just noticed that the following commits virtually erased all the code
> history, and they made it way harder to use git for analysis of the changes.
> I would suggest stopping further commits to the branch that contains
> "clearing all + updating all" changes, and start over from a reasonable
> branch.
> Please, take this seriously. It is really crucial to keep git annotate in a
> good shape, otherwise bug analysis becomes extremely hard.
> 0affa12bb12e45bf681a6e6a918d68884d7e1877 "clearing all the project contents
> from the xalanj master branch"
> 356ce496faa80d97ae8a8406e37f6bd994b39233 "updating master branch, to have
> same contents as the branch xalan-j_2_7_1_maint"
> For instance, if you check "git blame" for DocumentCall.java, you'll find
> that "every line was added only 2 months ago":
> https://github.com/apache/xalan-java/blame/master/src/org/apache/xalan/xsltc/compiler/DocumentCall.java
> I am afraid the above commits are showstopper for further activity on the
> branch.
> git blame on xalan-j_2_7_1_maint branch looks much better:
> https://github.com/apache/xalan-java/blame/xalan-j_2_7_1_maint/src/org/apache/xalan/xsltc/compiler/DocumentCall.java
> Since there were no releases on the master branch since the bad commits, I
> would suggest removing the commits from the repository completely.
> It is fine from the ASF policies, and it would be great to kill the commits
> as having commits that modify 400'000 lines make Git history hard to browse
> in various tools.
> Please remove those commits as they make history browsing, and error analysis
> hard.
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@xalan.apache.org
For additional commands, e-mail: dev-h...@xalan.apache.org
