]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 51c6f51) | patch
Teach NameConflictTreeWalk to report DF conflicts 69/1169/3
authorChristian Halstrick <christian.halstrick@sap.com>
Thu, 22 Jul 2010 13:57:14 +0000 (15:57 +0200)
committerChristian Halstrick <christian.halstrick@sap.com>
Wed, 28 Jul 2010 15:26:31 +0000 (17:26 +0200)
commit74d279fbf07538f54c6d0fe689a1578eb76c52e1
tree7598077ccbeb839f1467dedfaf7dfe1344b6c42ctree | snapshot
parent51c6f513b02bd178cc27c8afbde4f49611e81a8ecommit | diff
Teach NameConflictTreeWalk to report DF conflicts

Add a method isDirectoryFileConflict() to NameConflictTreeWalk which
tells whether the current path is part of a directory/file conflict.

Change-Id: Iffcc7090aaec743dd6f3fd1a333cac96c587ae5d
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/NameConflictTreeWalkTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/NameConflictTreeWalk.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit