diff options
Diffstat (limited to 'gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java')
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java b/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java index d7bf5a36b5..e7d146ae2a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java @@ -1,4 +1,5 @@ // Copyright (C) 2012 The Android Open Source Project +// Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -252,6 +253,11 @@ public class RebaseChange { + depChange.getKey().toString()); } + if (depChange.getStatus() == Status.DEFERRED) { + throw new IOException("Cannot rebase a change with an deferred parent: " + + depChange.getKey().toString()); + } + if (depChange.getStatus().isOpen()) { if (depPatchSet.getId().equals(depChange.currentPatchSetId())) { throw new IOException( |