private NonNoteEntry mergeNonNotes(NonNoteEntry baseList, NonNoteEntry oursList, NonNoteEntry theirsList) throws IOException { if (baseList == null && oursList == null && theirsList == null) return null; ObjectId baseId = write(baseList); ObjectId oursId = write(oursList); ObjectId theirsId = write(theirsList); inserter.flush(); Merger m = nonNotesMergeStrategy.newMerger(db, true); if (m instanceof ThreeWayMerger) ((ThreeWayMerger) m).setBase(baseId); if (!m.merge(oursId, theirsId)) throw new NotesMergeConflictException(baseList, oursList, theirsList); ObjectId resultTreeId = m.getResultTreeId(); AbbreviatedObjectId none = AbbreviatedObjectId.fromString(""); //$NON-NLS-1$ return NoteParser.parse(none, resultTreeId, reader).nonNotes; }
untrackedCommit = revWalk.parseCommit(stashCommit.getParent(2)); ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo); merger.setCommitNames(new String[] { "stashed HEAD", "HEAD", //$NON-NLS-1$ //$NON-NLS-2$ "stash" }); //$NON-NLS-1$ .newMerger(repo, true); ixMerger.setCommitNames(new String[] { "stashed HEAD", //$NON-NLS-1$ "HEAD", "stashed index" }); //$NON-NLS-1$//$NON-NLS-2$ .newMerger(repo, true); untrackedMerger.setCommitNames(new String[] { "null", "HEAD", "untracked files" }); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
repo.writeSquashCommitMsg(squashMessage); Merger merger = mergeStrategy.newMerger(repo); merger.setProgressMonitor(monitor); boolean noProblems;
+ " " + srcCommit.getShortMessage(); //$NON-NLS-1$ ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo); merger.setWorkingTreeIterator(new FileTreeIterator(repo)); merger.setBase(srcCommit.getTree());
+ " " + srcCommit.getShortMessage(); //$NON-NLS-1$ ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo); merger.setWorkingTreeIterator(new FileTreeIterator(repo)); merger.setBase(srcParent.getTree());
@Nonnull private Merger prepareMerger() throws IOException { Merger merger = strategy.newMerger(repo, true); if(merger instanceof ResolveMerger) { ResolveMerger resolver = ((ResolveMerger)merger); resolver.setDirCache(cache); resolver.setCommitNames(new String[] {"BASE", branchRef.getName(), sourceRef.getName()}); resolver.setWorkingTreeIterator(iterateRoot(gfs)); } return merger; }
@Nonnull private Merger prepareMerger() throws IOException { Merger merger = strategy.newMerger(repo, true); if(merger instanceof ResolveMerger) { ResolveMerger resolver = ((ResolveMerger)merger); resolver.setDirCache(cache); resolver.setCommitNames(new String[] {"BASE", branchRef.getName(), sourceRef.getName()}); resolver.setWorkingTreeIterator(iterateRoot(gfs)); } return merger; }
private void prepareMerger() throws IOException { merger = (ResolveMerger)strategy.newMerger(repo, true); merger.setBase(stash.getParent(0)); merger.setCommitNames(new String[] {"BASE", "Updated upstream", "Stashed changes"}); merger.setWorkingTreeIterator(iterateRoot(gfs)); }
private void prepareMerger() throws IOException { merger = (ResolveMerger)strategy.newMerger(repo, true); merger.setBase(stash.getParent(0)); merger.setCommitNames(new String[] {"BASE", "Updated upstream", "Stashed changes"}); merger.setWorkingTreeIterator(iterateRoot(gfs)); }
private NonNoteEntry mergeNonNotes(NonNoteEntry baseList, NonNoteEntry oursList, NonNoteEntry theirsList) throws IOException { if (baseList == null && oursList == null && theirsList == null) return null; ObjectId baseId = write(baseList); ObjectId oursId = write(oursList); ObjectId theirsId = write(theirsList); inserter.flush(); Merger m = nonNotesMergeStrategy.newMerger(db, true); if (m instanceof ThreeWayMerger) ((ThreeWayMerger) m).setBase(baseId); if (!m.merge(oursId, theirsId)) throw new NotesMergeConflictException(baseList, oursList, theirsList); ObjectId resultTreeId = m.getResultTreeId(); AbbreviatedObjectId none = AbbreviatedObjectId.fromString(""); //$NON-NLS-1$ return NoteParser.parse(none, resultTreeId, reader).nonNotes; }
private NonNoteEntry mergeNonNotes(NonNoteEntry baseList, NonNoteEntry oursList, NonNoteEntry theirsList) throws IOException { if (baseList == null && oursList == null && theirsList == null) return null; ObjectId baseId = write(baseList); ObjectId oursId = write(oursList); ObjectId theirsId = write(theirsList); inserter.flush(); Merger m = nonNotesMergeStrategy.newMerger(db, true); if (m instanceof ThreeWayMerger) ((ThreeWayMerger) m).setBase(baseId); if (!m.merge(oursId, theirsId)) throw new NotesMergeConflictException(baseList, oursList, theirsList); ObjectId resultTreeId = m.getResultTreeId(); AbbreviatedObjectId none = AbbreviatedObjectId.fromString(""); //$NON-NLS-1$ return NoteParser.parse(none, resultTreeId, reader).nonNotes; }
untrackedCommit = revWalk.parseCommit(stashCommit.getParent(2)); ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo); merger.setCommitNames(new String[] { "stashed HEAD", "HEAD", //$NON-NLS-1$ //$NON-NLS-2$ "stash" }); //$NON-NLS-1$ .newMerger(repo, true); ixMerger.setCommitNames(new String[] { "stashed HEAD", //$NON-NLS-1$ "HEAD", "stashed index" }); //$NON-NLS-1$//$NON-NLS-2$ .newMerger(repo, true); untrackedMerger.setCommitNames(new String[] { "null", "HEAD", "untracked files" }); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
final Merger merger = mergeStrategy.newMerger(repo); final Map<String, org.eclipse.jgit.merge.MergeResult<?>> lowLevelResults; final Map<String, ResolveMerger.MergeFailureReason> failingPaths;
untrackedCommit = revWalk.parseCommit(stashCommit.getParent(2)); ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo); merger.setCommitNames(new String[] { "stashed HEAD", "HEAD", //$NON-NLS-1$ //$NON-NLS-2$ "stash" }); //$NON-NLS-1$ .newMerger(repo, true); ixMerger.setCommitNames(new String[] { "stashed HEAD", //$NON-NLS-1$ "HEAD", "stashed index" }); //$NON-NLS-1$//$NON-NLS-2$ .newMerger(repo, true); untrackedMerger.setCommitNames(new String[] { "null", "HEAD", "untracked files" }); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
repo.writeSquashCommitMsg(squashMessage); Merger merger = mergeStrategy.newMerger(repo); merger.setProgressMonitor(monitor); boolean noProblems;
repo.writeSquashCommitMsg(squashMessage); Merger merger = mergeStrategy.newMerger(repo); merger.setProgressMonitor(monitor); boolean noProblems;
+ " " + srcCommit.getShortMessage(); //$NON-NLS-1$ ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo); merger.setWorkingTreeIterator(new FileTreeIterator(repo)); merger.setBase(srcCommit.getTree());
+ " " + srcCommit.getShortMessage(); //$NON-NLS-1$ ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo); merger.setWorkingTreeIterator(new FileTreeIterator(repo)); merger.setBase(srcCommit.getTree());
+ " " + srcCommit.getShortMessage(); //$NON-NLS-1$ ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo); merger.setWorkingTreeIterator(new FileTreeIterator(repo)); merger.setBase(srcParent.getTree());
+ " " + srcCommit.getShortMessage(); //$NON-NLS-1$ ResolveMerger merger = (ResolveMerger) strategy.newMerger(repo); merger.setWorkingTreeIterator(new FileTreeIterator(repo)); merger.setBase(srcParent.getTree());