From: Petr Baudis <pasky@suse.cz>
To: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Jon Smirl <jonsmirl@gmail.com>,
git@vger.kernel.org, junkio@cox.net
Subject: Re: [PATCH 1/2] t7001: add test for git-mv dir1 dir2/
Date: Fri, 28 Jul 2006 03:30:38 +0200 [thread overview]
Message-ID: <20060728013038.GH13776@pasky.or.cz> (raw)
In-Reply-To: <200607262039.25155.Josef.Weidendorfer@gmx.de>
Dear diary, on Wed, Jul 26, 2006 at 08:39:24PM CEST, I got a letter
where Josef Weidendorfer <Josef.Weidendorfer@gmx.de> 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
next prev parent reply other threads:[~2006-07-28 1:30 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-26 17:41 [PATCH 1/2] t7001: add test for git-mv dir1 dir2/ Johannes Schindelin
2006-07-26 17:50 ` Jon Smirl
2006-07-26 18:23 ` Junio C Hamano
2006-07-26 18:31 ` Jon Smirl
2006-07-26 18:58 ` Junio C Hamano
2006-07-26 19:31 ` Junio C Hamano
2006-07-26 20:33 ` Jon Smirl
2006-07-26 18:47 ` Johannes Schindelin
2006-07-26 18:39 ` Josef Weidendorfer
2006-07-26 19:05 ` Junio C Hamano
2006-07-28 1:30 ` Petr Baudis [this message]
2006-07-28 2:41 ` Junio C Hamano
2006-07-28 2:56 ` Petr Baudis
2006-07-28 4:48 ` Junio C Hamano
2006-07-28 15:47 ` Petr Baudis
2006-07-28 10:14 ` [PATCH] Teach git-apply about '-R' Johannes Schindelin
2006-07-28 15:14 ` Linus Torvalds
2006-07-28 15:46 ` [PATCH v2] " Johannes Schindelin
2006-07-28 15:36 ` [PATCH] " Junio C Hamano
2006-07-28 15:50 ` Johannes Schindelin
2006-07-28 19:20 ` Junio C Hamano
2006-07-28 19:36 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060728013038.GH13776@pasky.or.cz \
--to=pasky@suse.cz \
--cc=Johannes.Schindelin@gmx.de \
--cc=Josef.Weidendorfer@gmx.de \
--cc=git@vger.kernel.org \
--cc=jonsmirl@gmail.com \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).