Yazar | SHA1 | Mesaj | Tarih |
---|---|---|---|
|
b53e2a99b3 |
Silence non-externalized string warnings in CherryPickResult
Change-Id: I515abbcb4319b744c5074de5a0c56caed13c2fb5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> |
9 yıl önce |
|
4e1de30809 |
Add @Override annotations to enums
Change-Id: I8fa3b89a6349c1231251b346cae12c1c4f095929 |
12 yıl önce |
|
7aec8247c1 |
[findbugs] Make mutable static field final
Change-Id: I310bc2093571bf22a58106f09706cc3eb43a2453 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> |
13 yıl önce |
|
761b9285f0 |
Do not categorize merge failures as 'abnormal'
This change contains a simple renaming. Instead of using the expression 'abnormal failure', we just treat this kind of situation as 'failure'. This is specific enough as conflicts are already handled separately. Change-Id: I535acdc7d022543ed0f5ac6151b09a6985f4ef38 Signed-off-by: Philipp Thun <philipp.thun@sap.com> |
13 yıl önce |
|
a21e508a31 |
Introduce CherryPickResult
In order to distinguish cherry-pick failures caused by conflicts vs. 'abnormal failures' (e.g. due to unstaged changes or a dirty worktree), a CherryPickResult class is introduced and returned by CherryPickCommand.call() instead of a RevCommit. This new class is similar to MergeResult and RebaseResult. The CherryPickResult contains all necessary information, e.g. paths causing the cherry-pick (a merge called within, respectively) to fail. This allows callers to better react on failures. Change-Id: I5db57b9259e82ed118e4bf4ec94463efe68b8c1f Signed-off-by: Philipp Thun <philipp.thun@sap.com> Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> |
13 yıl önce |