On Sat, Dec 05, 2009 at 01:36:13PM -0800, Shawn O. Pearce wrote: > Jeff Epler <jepler@xxxxxxxxxxxxxx> wrote: > > I've found another problem, which I'll work on as soon as I find a > > chance. > > > > When staging multiple "+" lines preceded by a "-" line that must be > > turned into context, the converted "-" line must come after *all* the > > "+" lines, not just the first one. > > So the reason this series got stuck was this message, this bug is > enough to suggest we shouldn't apply it to my tree yet, so I've > been waiting for an update on the topic. In an attempt to help this series forward I tried to reproduce this bug but were unsuccessfull. It seems that a change like this: @@ -13,7 +13,9 @@ set appvers {@@GITGUI_VERSION@@} set copyright [encoding convertfrom utf-8 { Copyright © 2006, 2007 Shawn Pearce, et. al. -This program is free software; you can redistribute it and/or modify +Blabla +blubblub +lalala it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. and then trying to stage part of the '+' lines is not enough. Jeff could you clarify or provide an example? cheers Heiko -- 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