* Re: [BUG]: Destructive behaviour of git revert [not found] <CAP82knNJ7YH30R-Z61ake58qERp--6hdvgGasKpHQ2TbMPraiA@mail.gmail.com> @ 2019-07-30 17:24 ` Andreas Wiesinger 2019-07-30 18:36 ` Phillip Wood 0 siblings, 1 reply; 2+ messages in thread From: Andreas Wiesinger @ 2019-07-30 17:24 UTC (permalink / raw) To: git Hello, git revert for merges will mark merged files as deleted and commit them as if they would have been deleted, but that is for sure never what anybody would expect and has deleted many files unintentionally and unrecognized in our repo shortly. I have reproduced this issue in a very small example repo here: https://gitlab.com/electrocnic/git-revert-destructive-behaviour/tree/master Expected behaviour would be: A reverted merge should never mark any files or directories as "deleted", and merging the branch where the other merge has been reverted should not lead to the deletion of those files. I classify this behaviour as really really destructive and clearly a bug, even if this behaviour is by intention. It should not be by intention then.. Best regards, Andreas ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [BUG]: Destructive behaviour of git revert 2019-07-30 17:24 ` [BUG]: Destructive behaviour of git revert Andreas Wiesinger @ 2019-07-30 18:36 ` Phillip Wood 0 siblings, 0 replies; 2+ messages in thread From: Phillip Wood @ 2019-07-30 18:36 UTC (permalink / raw) To: Andreas Wiesinger, git Hi Andreas On 30/07/2019 18:24, Andreas Wiesinger wrote: > Hello, > > git revert for merges will mark merged files as deleted and commit > them as if they would have been deleted, but that is for sure never > what anybody would expect and has deleted many files unintentionally > and unrecognized in our repo shortly. > > I have reproduced this issue in a very small example repo here: > https://gitlab.com/electrocnic/git-revert-destructive-behaviour/tree/master > > Expected behaviour would be: > > A reverted merge should never mark any files or directories as > "deleted", and merging the branch where the other merge has been > reverted should not lead to the deletion of those files. Thanks for creating an example. I've had a quick look at it and it appears that you have a merge that adds a new file from the branch being merged, then when you revert the merge that file is deleted. Could you explain what you want to happen when you revert that merge? The idea of revert is to undo the changes introduced by the commit that is being reverted, I'm struggling to understand why you think revert should not do this for files that are added. Best Wishes Phillip > I classify this behaviour as really really destructive and clearly a > bug, even if this behaviour is by intention. It should not be by > intention then.. > > Best regards, > Andreas > ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-30 18:36 UTC | newest] Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <CAP82knNJ7YH30R-Z61ake58qERp--6hdvgGasKpHQ2TbMPraiA@mail.gmail.com> 2019-07-30 17:24 ` [BUG]: Destructive behaviour of git revert Andreas Wiesinger 2019-07-30 18:36 ` Phillip Wood
Code repositories for project(s) associated with this public inbox https://80x24.org/mirrors/git.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).