From: Martin Langhoff <martin.langhoff@gmail.com>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: Moved files and merges
Date: Sat, 3 Sep 2005 12:20:41 +1200 [thread overview]
Message-ID: <46a038f90509021720417a9b59@mail.gmail.com> (raw)
In-Reply-To: <4318E754.9000703@zytor.com>
On 9/3/05, H. Peter Anvin <hpa@zytor.com> wrote:
> Is there any way I can record in the repository that these files are
> actually moved files, and that the merge should apply the patch elsewhere?
Well, if you run pickaxe at merge-time on the file-paths that weren't
found, you can probably walk the pickaxe output until you find the
file move, and then reapply the patches.
Probably should be hacked into cg-merge. When the merge reports a file
is missing, what happens? Does it leave a .rej file or anything?
cheers
martin
next prev parent reply other threads:[~2005-09-03 0:20 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-02 23:59 Moved files and merges H. Peter Anvin
2005-09-03 0:20 ` Martin Langhoff [this message]
2005-09-04 4:14 ` H. Peter Anvin
2005-09-03 1:36 ` Junio C Hamano
2005-09-03 8:25 ` Junio C Hamano
2005-09-03 18:06 ` Fredrik Kuivinen
2005-09-03 18:53 ` Junio C Hamano
2005-09-03 18:46 ` Junio C Hamano
2005-09-03 19:05 ` Sam Ravnborg
2005-09-03 19:32 ` Junio C Hamano
2005-09-03 22:03 ` Sam Ravnborg
2005-09-04 7:32 ` Junio C Hamano
2005-09-04 18:28 ` Daniel Barkalow
2005-09-04 19:10 ` Junio C Hamano
2005-09-05 15:16 ` H. Peter Anvin
2005-09-05 15:47 ` Linus Torvalds
2005-09-05 16:37 ` H. Peter Anvin
2005-09-05 18:08 ` Junio C Hamano
2005-09-05 18:33 ` Junio C Hamano
2005-09-05 18:43 ` H. Peter Anvin
2005-09-04 8:27 ` Junio C Hamano
2005-09-03 19:21 ` Fredrik Kuivinen
2005-09-03 18:59 ` Sam Ravnborg
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46a038f90509021720417a9b59@mail.gmail.com \
--to=martin.langhoff@gmail.com \
--cc=git@vger.kernel.org \
--cc=hpa@zytor.com \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.