Dear diary, on Wed, Jul 26, 2006 at 08:39:24PM CEST, I got a letter where Josef Weidendorfer <Josef.Weidendorfer@xxxxxx> said that... > On Wednesday 26 July 2006 19:41, Johannes Schindelin wrote: > > > > If dir2 already exists, git-mv should move dir1 _into_dir2/. > > Noticed by Jon Smirl. > > Thanks for adding this test. > BTW, the original PERL script passes it quite fine. > > I just looked at Jon's problem. Doesn't seem to be related to > git-mv or git at all, but more a cogito problem. > I have some cogito-0.18pre installed, and cg-patch is patching > the stuff all itself, not using git for this. Pasky? Unfortunately, git-apply is still quite unusable for Cogito. It can do fuzzy merging now, but here's some random list of more issues I still have with it (I'm leaving for some two weeks or so of holiday soon so I won't have to fix them soon personally; it'd be nice if someone did, though ;) : (i) No git-apply -R - well, it seems to me that I revert patches all the time, don't you? (ii) I'd like git-apply to be as verbose as patch is, that is list the files it touches as it goes (iii) There's no reject handling besides "panic" right now - it should be able to create .rej files so that the user can fix things up (iv) I need git-apply to add/remove to/from index new/gone files, while at the same time... (v) I want to allow applying of patches to working copy that is not completely clean, even on top of modified files But yes, I'd like cg-patch to move to use git-apply. It's currently _way_ too scary. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ Snow falling on Perl. White noise covering line noise. Hides all the bugs too. -- J. Putnam - : 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