You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@xalan.apache.org by Vladimir Sitnikov <si...@gmail.com> on 2023/06/16 06:10:05 UTC
Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits
Hi,
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.
---
If you want to "forget everything on master and continue
with xalan-j_2_7_1_maint", then the best scenario would be
retargeting main branch to xalan-j_2_7_1_maint and continuing from there.
---
Dear xalan committers, please, consider using pull requests for proposing
the changes.
I am sure a pull request that performed 403,833 deletions and 400,423
additions would raise an eyebrow.
Vladimir
Re: Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits
Posted by Vladimir Sitnikov <si...@gmail.com>.
> Joseph: 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.
That is exactly what I suggest.
There are many ways to recreate "master" branch with appropriate contents.
> Mukul: you're seeing issues with git blame command. But that's not a
>significant issue I guess, with XalanJ's current codebase
"git blame" is a true issue. It will show in IDE, and it will show in GitHub UI.
There are trivial ways to avoid that (e.g. create the branch
appropriately without deleting the files),
so I suggest the branch should be fixed before adding more commits there.
Vladimir
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@xalan.apache.org
For additional commands, e-mail: dev-help@xalan.apache.org
Re: Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits
Posted by Joseph Kesselman <ke...@alum.mit.edu>.
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 <mu...@apache.org>
Sent: Friday, June 16, 2023 1:12:02 PM
To: dev@xalan.apache.org <de...@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
<si...@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-unsubscribe@xalan.apache.org
For additional commands, e-mail: dev-help@xalan.apache.org
Re: Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits
Posted by Mukul Gandhi <mu...@apache.org>.
Hi Vladimir,
On Fri, Jun 16, 2023 at 9:52 PM Vladimir Sitnikov
<si...@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-unsubscribe@xalan.apache.org
For additional commands, e-mail: dev-help@xalan.apache.org
Re: Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits
Posted by Joseph Kesselman <ke...@alum.mit.edu>.
If we decide to address this by doing a new fork operation, this would be a perfect window for switching the name from Master to Main, to follow current git practice.
--
/_ 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: Vladimir Sitnikov <si...@gmail.com>
Sent: Friday, June 16, 2023 12:22:27 PM
To: dev@xalan.apache.org <de...@xalan.apache.org>
Subject: Re: Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits
Gary, I provided the link in the original email:
https://github.com/apache/xalan-java/blame/master/src/org/apache/xalan/xsltc/compiler/DocumentCall.java
compare it with a much better one (pay attention to commit ids to the left of the line numbers):
https://github.com/apache/xalan-java/blame/xalan-j_2_7_1_maint/src/org/apache/xalan/xsltc/compiler/DocumentCall.java
You can try the same locally:
git blame src/org/apache/xalan/xsltc/compiler/DocumentCall.java
In master branch the command prints "356ce496f (Mukul Gandhi 2023-04-14" for every line of the file.
Vladimir
Re: Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits
Posted by Vladimir Sitnikov <si...@gmail.com>.
Gary, I provided the link in the original email:
https://github.com/apache/xalan-java/blame/master/src/org/apache/xalan/xsltc/compiler/DocumentCall.java
compare it with a much better one (pay attention to commit ids to the left
of the line numbers):
https://github.com/apache/xalan-java/blame/xalan-j_2_7_1_maint/src/org/apache/xalan/xsltc/compiler/DocumentCall.java
You can try the same locally:
git blame src/org/apache/xalan/xsltc/compiler/DocumentCall.java
In master branch the command prints "356ce496f (Mukul Gandhi 2023-04-14"
for every line of the file.
Vladimir
Re: Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits
Posted by Vladimir Sitnikov <si...@gmail.com>.
I've filed https://issues.apache.org/jira/browse/XALANJ-2671
Vladimir
Re: Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits
Posted by Mukul Gandhi <mu...@apache.org>.
Hi Vladimir,
On Sat, Jul 1, 2023 at 1:48 PM Vladimir Sitnikov
<si...@gmail.com> wrote:
> The same issue impacts xalan-j_xslt3.0 branch.
>
> Would you please fix git history before commiting more changes to the impacted branches?
I personally don't think, this issue is currently impacting anything
related to XalanJ project. Perhaps, some of the source code history,
with which you seem to be concerned with (as per git scm sense) has
been affected while we merged XalanJ 2.7.3 repos codebase to the
XalanJ 'master' branch. This could be technically possible to be
improved, but I don't see substantial benefits of doing this task
around these days.
Lots of, XalanJ source code history is still available, on the
'master' branch, and that seems to me to be, useful and enough to take
the XalanJ project for further enhancement.
But if you still feel that, this issue is important and needs to be
fixed, I'd suggest to please raise a XalanJ jira issue for this
possibly with issue type 'Improvement' and mentioning pros and cons of
doing this task, and then that could be tracked and decided
appropriately by XalanJ team.
--
Regards,
Mukul Gandhi
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@xalan.apache.org
For additional commands, e-mail: dev-help@xalan.apache.org
Re: Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits
Posted by Vladimir Sitnikov <si...@gmail.com>.
The same issue impacts xalan-j_xslt3.0 branch.
Would you please fix git history before commiting more changes to the
impacted branches?
Vladimir
--
Vladimir
Re: Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits
Posted by Vladimir Sitnikov <si...@gmail.com>.
If the sole purpose of the offending commits was to bring the master branch
to
the same state as xalan-j_2_7_1_maint branch, then I would suggest:
git switch master
git reset --hard f51fdd9e72b596ddba4894257f1990846be2fe63 # the current
head for origin/xalan-j_2_7_1_maint
git cherry-pick ff6743972a311e2c69423a8821600332937826c4 # Add SECURITY.md
git push --force origin master
Note: there are many whitespace diffs between the current "master" and
"2_7_1_maint" branches,
and I would strongly suggest merging
https://github.com/apache/xalan-java/pull/7 to make EOL handling consistent
in xalan-java git.
Vladimir
Re: Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits
Posted by Stanimir Stamenkov <s7...@netscape.net.INVALID>.
Fri, 16 Jun 2023 11:21:48 -0400, /Gary Gregory/:
> I see lots of commits here
> https://github.com/apache/xalan-java/commits/master
>
> Where are you looking Vladimir?
I only speculate:
https://github.com/apache/xalan-java/commit/356ce496faa80d97ae8a8406e37f6bd994b39233
"updating master branch, to have same contents as the branch
xalan-j_2_7_1_maint"
In my opinion the master branch prior that point should be archived by
creating a new branch (from that previous commit), then it should be
reset (hard) to the head of the xalan-j_2_7_1_maint branch. The commits
following the given one may need to be re-merged.
--
Stanimir
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@xalan.apache.org
For additional commands, e-mail: dev-help@xalan.apache.org
Re: Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits
Posted by Gary Gregory <ga...@gmail.com>.
I see lots of commits here
https://github.com/apache/xalan-java/commits/master
Where are you looking Vladimir?
Gary
On Fri, Jun 16, 2023, 11:12 Mukul Gandhi <mu...@apache.org> wrote:
> Hi Gary & Vladimir,
>
> On Fri, Jun 16, 2023 at 8:16 PM Gary Gregory <ga...@gmail.com>
> wrote:
> >
> > Our master branch should have all of the history from 2.7.3 all the way
> back as far as reasonably possible. If it does not, then that's an issue
> indeed.
>
> I'm able to see, all the codebase files commit history for XalanJ's
> 'master' branch (I've quickly looked on xalan-java repos). I don't
> seem to find any issues with XalanJ codebase commit history.
>
>
> --
> Regards,
> Mukul Gandhi
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@xalan.apache.org
> For additional commands, e-mail: dev-help@xalan.apache.org
>
>
Re: Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits
Posted by Mukul Gandhi <mu...@apache.org>.
Hi Gary & Vladimir,
On Fri, Jun 16, 2023 at 8:16 PM Gary Gregory <ga...@gmail.com> wrote:
>
> Our master branch should have all of the history from 2.7.3 all the way back as far as reasonably possible. If it does not, then that's an issue indeed.
I'm able to see, all the codebase files commit history for XalanJ's
'master' branch (I've quickly looked on xalan-java repos). I don't
seem to find any issues with XalanJ codebase commit history.
--
Regards,
Mukul Gandhi
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@xalan.apache.org
For additional commands, e-mail: dev-help@xalan.apache.org
Re: Source code history lost in "clearing all contents" + "updating master branch, to have same contents as..." commits
Posted by Gary Gregory <ga...@gmail.com>.
Our master branch should have all of the history from 2.7.3 all the way
back as far as reasonably possible. If it does not, then that's an issue
indeed.
Gary
On Fri, Jun 16, 2023, 02:10 Vladimir Sitnikov <si...@gmail.com>
wrote:
> Hi,
>
> 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.
>
> ---
>
> If you want to "forget everything on master and continue
> with xalan-j_2_7_1_maint", then the best scenario would be
> retargeting main branch to xalan-j_2_7_1_maint and continuing from there.
>
> ---
>
> Dear xalan committers, please, consider using pull requests for proposing
> the changes.
> I am sure a pull request that performed 403,833 deletions and 400,423
> additions would raise an eyebrow.
>
> Vladimir
>