From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Date: Sat, 25 Jul 2009 23:34:10 GMT
Subject: Re: [JGIT PATCH 09/19] Refactor Config hierarchy to make IO more explicit
Message-ID: <200907260134.10820.robin.rosenberg.lists@dewire.com>
In-Reply-To: <20090725225504.GG11191@spearce.org>

söndag 26 juli 2009 00:55:04 skrev "Shawn O. Pearce" <spearce@spearce.org>:
> Robin Rosenberg <robin.rosenberg.lists@dewire.com> 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