Hi, On Fri, 25 Jan 2008, Daniel Barkalow wrote: > On Fri, 25 Jan 2008, Johannes Schindelin wrote: > > > On Thu, 24 Jan 2008, Junio C Hamano wrote: > > > > > Daniel Barkalow <barkalow@xxxxxxxxxxxx> writes: > > > > > > > $ git checkout branch > > > > Warning: xt_CONNMARK.c conflicts with xt_connmark.c; not checking it out > > > > $ git checkout xt_CONNMARK.c --as xt_CONNMARK_caps.c > > > > $ edit xt_CONNMARK_caps.c > > > > $ git add xt_CONNMARK_caps.c > > > > > > Heh, I like that very much. > > > > It would make it easier to test on Linux, too, yes. > > > > But then, it would break the build process all the same. > > Sure, but it would permit a user of a filesystem that can't handle the > project to make modifications that generate a commit the filesystem can > handle, which is currently pretty difficult. > > $ git checkout xt_CONNMARK.c --as xt_CONNMARK_tmp.c > $ mv xt_CONNMARK_tmp.c xt_connmark_flag.c > $ edit Makefile > $ git add xt_connmark_flag.c > $ git commit -a AFAICT it is possible right now: $ git checkout xt_CONNMARK.c $ git mv xt_CONNMARK.c xt_connmark_flag.c $ git checkout xt_connmark.c $ edit Makefile $ git add Makefile $ git commit Ciao, Dscho - 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
