Easily find issues by searching: #<Issue ID>
Example: #1832
Easily find members by searching in: <username>, <first name> and <last name>.
Example: Search smith, will return results smith and adamsmith
| Dev |
|
| QA |
|
| Priority | Low |
| Complexity | Unknown |
| Component | App - Version Control - GIT |
| Version | 10.0 |
1. create a new unversioned file (let's say, A) in a local repository
2. in the remote repository, create the same file and commit it
3. git PUSH
--> push operation will actually fail because 'a local untracked file will be overwritten by a merge operation' or something like that.
Added diagnostic messages:
case UP_TO_DATE:
// Remote ref was up to date, there was no need to update anything.
print(TXT.get("GitPushDialog.result.UP_TO_DATE", "Remote is up to date:") + " " + ru.getRemoteName());
break;
case REJECTED_NONFASTFORWARD:
// Remote ref update was rejected, as it would cause non fast-forward update.
failed = true;
print(TXT.get("GitPushDialog.result.REJECTED_NONFASTFORWARD", "Rejected, as it would cause a non-fast forward update:") + " " + ru.getRemoteName());
break;
case REJECTED_NODELETE:
// Remote ref update was rejected, because remote side doesn't support/allow deleting refs.
failed = true;
print(TXT.get("GitPushDialog.result.REJECTED_NODELETE", "Rejected because remote side doesn't support or allow deleting refs:") + " " + ru.getRemoteName());
break;
case REJECTED_REMOTE_CHANGED:
// Remote ref update was rejected, because old object id on remote repository wasn't the same as defined expected old object.
failed = true;
print(TXT.get("GitPushDialog.result.REJECTED_REMOTE_CHANGED", "Rejected, objects are not the same:") + " " + ru.getRemoteName());
break;
case REJECTED_OTHER_REASON:
// Remote ref update was rejected for other reason, possibly described in RemoteRefUpdate.getMessage()
failed = true;
print(TXT.get("GitPushDialog.result.REJECTED_OTHER_REASON", "Rejected") + msg + ru.getRemoteName());
break;
case NON_EXISTING:
// Remote ref didn't exist. Can occur on delete request of a non existing ref.
failed = true;
print(TXT.get("GitPushDialog.result.NON_EXISTING", "Remote ref does not exist:") + ru.getRemoteName());
break;
case AWAITING_REPORT:
// Push process is awaiting update report from remote repository. This is a temporary state or state after critical error in push process.
failed = true;
print("AWAITING_REPORT: " + ru.getRemoteName());
Issue #6090 |
| Closed |
| Fixed |
| Resolved |
Completion |
| No due date |
| No fixed build |
| No time estimate |
Added diagnostic messages:
case UP_TO_DATE:
// Remote ref was up to date, there was no need to update anything.
print(TXT.get("GitPushDialog.result.UP_TO_DATE", "Remote is up to date:") + " " + ru.getRemoteName());
break;
case REJECTED_NONFASTFORWARD:
// Remote ref update was rejected, as it would cause non fast-forward update.
failed = true;
print(TXT.get("GitPushDialog.result.REJECTED_NONFASTFORWARD", "Rejected, as it would cause a non-fast forward update:") + " " + ru.getRemoteName());
break;
case REJECTED_NODELETE:
// Remote ref update was rejected, because remote side doesn't support/allow deleting refs.
failed = true;
print(TXT.get("GitPushDialog.result.REJECTED_NODELETE", "Rejected because remote side doesn't support or allow deleting refs:") + " " + ru.getRemoteName());
break;
case REJECTED_REMOTE_CHANGED:
// Remote ref update was rejected, because old object id on remote repository wasn't the same as defined expected old object.
failed = true;
print(TXT.get("GitPushDialog.result.REJECTED_REMOTE_CHANGED", "Rejected, objects are not the same:") + " " + ru.getRemoteName());
break;
case REJECTED_OTHER_REASON:
// Remote ref update was rejected for other reason, possibly described in RemoteRefUpdate.getMessage()
failed = true;
print(TXT.get("GitPushDialog.result.REJECTED_OTHER_REASON", "Rejected") + msg + ru.getRemoteName());
break;
case NON_EXISTING:
// Remote ref didn't exist. Can occur on delete request of a non existing ref.
failed = true;
print(TXT.get("GitPushDialog.result.NON_EXISTING", "Remote ref does not exist:") + ru.getRemoteName());
break;
case AWAITING_REPORT:
// Push process is awaiting update report from remote repository. This is a temporary state or state after critical error in push process.
failed = true;
print("AWAITING_REPORT: " + ru.getRemoteName());