söndag 26 juli 2009 00:55:04 skrev "Shawn O. Pearce" <spearce@xxxxxxxxxxx>: > Robin Rosenberg <robin.rosenberg.lists@xxxxxxxxxx> wrote: > > > > This one does not apply for the Config class here. > > Did you apply with --whitespace=strip or something and fall afoul > of a merge conflict due to changed context? > I tried both ways. Config.java looks (partially) like this: -------------------------- import java.util.Map; import java.util.Set; /** ---------------------------- and the patch looks (partially again) like this: @@ -55,19 +49,18 @@ import java.util.Map; import java.util.Set; +import org.spearce.jgit.errors.ConfigInvalidException; import org.spearce.jgit.util.StringUtils; + /** ---------------- So the import among other things, does not match. -- robin -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html