Eclipse Community Forums: EGit / JGit

Help

Home

Home » Eclipse Projects » EGit / JGit » Cannot revert commit

Show: Today's Messages :: Show Polls :: Message Navigator

Cannot revert commit [message #1843473]

Sat, 31 July 2021 16:30

Yuriy Mitrofanov

Messages: 22
Registered: July 2021

Junior Member

When I use git I have no error:
C:\Projects\repo4>git revert 59107f2 -m 1 [master 38729f3] Revert "Merge pull request #1 from robfrank/master"
2 files changed, 684 insertions(+), 696 deletions(-)

When I use jgit I get an error:
ObjectId id = git.getRepository().resolve(revertid);
RevCommit commit = new RevWalk(git.getRepository()).parseCommit(id.toObjectId());
RevCommit revertCommand = git.revert().include(commit).call();

Cannot revert commit '59107f2328b82cd9c34986863ac648341bf705c6' because it has 2 parents, only commits with exactly one parent are supported

Is there an easy way to solve this problem?

Report message to a moderator

Re: Cannot revert commit [message #1843474 is a reply to message #1843473]

Sat, 31 July 2021 17:35

Thomas Wolf

Messages: 576
Registered: August 2016

Senior Member

Yes. Implement the --mainline option for JGit's RevertCommand and contribute the code :-). But see also what the git documentation has to say about reverting merge commits.

Report message to a moderator

Re: Cannot revert commit [message #1843476 is a reply to message #1843474]

Sat, 31 July 2021 18:04

Yuriy Mitrofanov

Messages: 22
Registered: July 2021

Junior Member

Thomas Wolf wrote on Sat, 31 July 2021 17:35

Yes. Implement the --mainline option for JGit's RevertCommand and contribute the code :-). But see also what the git documentation has to say about reverting merge commits.

A very simple way )))))))))))))))))))))

Report message to a moderator

Previous Topic:	Create binary diff and apply binary diff
Next Topic:	Wrong file hash

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Fri Apr 26 06:09:49 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter