Browse Source

Fix RepositoryState.MERGING

canResetHead now returns true.
Resetting mixed / hard works in EGit in merging state.

Change-Id: I1512145bbd831bb9734528ce8b71b1701e3e6aa9
Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
stable-0.9
Jens Baumgart 14 years ago
parent
commit
f714988c61
  1. 4
      org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java

4
org.eclipse.jgit/src/org/eclipse/jgit/lib/RepositoryState.java

@ -73,11 +73,11 @@ public enum RepositoryState {
public String getDescription() { return JGitText.get().repositoryState_normal; }
},
/** An unfinished merge. Must resole or reset before continuing normally
/** An unfinished merge. Must resolve or reset before continuing normally
*/
MERGING {
public boolean canCheckout() { return false; }
public boolean canResetHead() { return false; }
public boolean canResetHead() { return true; }
public boolean canCommit() { return false; }
public String getDescription() { return JGitText.get().repositoryState_conflicts; }
},

Loading…
Cancel
Save