Remove rework check for dependencies in RebaseSorter
The REWORK check that was added by me in Change 91703, is just to be cautious. However, after some thoughts about this, I don't think it is really necessary based on the following facts: * The diff of the change (which based on some old ps of its parent change) has been reviewed. * If there was a major rework on the parent change, there will be a merge conflict when the change is merged. Change-Id: Iabf544e8a119e262dd54e78d470af2e2800cfe4b
This commit is contained in:
@@ -648,14 +648,27 @@ public abstract class AbstractDaemonTest {
|
||||
String changeId, String ref, TestAccount testAccount, TestRepository<?> repo)
|
||||
throws Exception {
|
||||
Collections.shuffle(RANDOM);
|
||||
return amendChange(changeId, ref, testAccount, repo, PushOneCommit.SUBJECT,
|
||||
PushOneCommit.FILE_NAME, new String(Chars.toArray(RANDOM)));
|
||||
}
|
||||
|
||||
protected PushOneCommit.Result amendChange(String changeId, String subject, String fileName,
|
||||
String content) throws Exception {
|
||||
return amendChange(changeId, "refs/for/master", admin, testRepo, subject, fileName, content);
|
||||
}
|
||||
|
||||
protected PushOneCommit.Result amendChange(
|
||||
String changeId, String ref, TestAccount testAccount, TestRepository<?> repo, String subject,
|
||||
String fileName, String content)
|
||||
throws Exception {
|
||||
PushOneCommit push =
|
||||
pushFactory.create(
|
||||
db,
|
||||
testAccount.getIdent(),
|
||||
repo,
|
||||
PushOneCommit.SUBJECT,
|
||||
PushOneCommit.FILE_NAME,
|
||||
new String(Chars.toArray(RANDOM)),
|
||||
subject,
|
||||
fileName,
|
||||
content,
|
||||
changeId);
|
||||
return push.to(ref);
|
||||
}
|
||||
|
Reference in New Issue
Block a user