int rev = stream.revisionUpTo('\n');
GraftContext ctx = new GraftContext(this, rev);
if (!stream.isEof()) {
ctx.processStream(stream, true);
}
stream.consumeAll();
boolean flagOrKeepDeleteConflicts = !ctx.getFlagConflicts().isEmpty()
|| !ctx.getKeepDeleteConflicts().isEmpty();
if (getReturnCode() == -1 && this.hasConflicts || flagOrKeepDeleteConflicts) {
if (flagOrKeepDeleteConflicts && ctx.getMergeConflicts().isEmpty()) {
// graft has actually made a new changeset,