git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git-subtree: directory mismatch

From
Avery Pennarun <apenwarr@gmail.com>
Date
Nov 25, 2009, 19:48 UTC
Message-ID
<32541b130911251148v70a5dc77k9936881d0b382ec2@mail.gmail.com>
In-Reply-To
<7v7htexuxc.fsf@alter.siamese.dyndns.org>
On Wed, Nov 25, 2009 at 2:31 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 6 quoted lines
> Avery Pennarun <apenwarr@gmail.com> writes:
>> I've read through the thread (I do remember skimming it awhile ago)
>> but can't find patches for the syntax actually under discussion.
>
> I very much prefer gmane threading when following discussion over all the
> other mail archives, but this shows one thing I really dislike about it.
[...]
> Look at http://github.com/gitster/git/commits/jc/merge-theirs/

I also tried simply searching for things like 'git "-xsubtree"' in google, with no luck. But thanks for the link.

> and found this series in there.  It applies to v1.6.0-rc0~245 (no, I won't
> be rebasing this myself---I don't have time for that while preparing for
> the pre-release feature freeze).

I did a test merge and it looks like a ton of conflicts, but they seem to be pretty understandable ones, at least. I don't mind doing the rebase and resubmitting the patches, since it's sure less work than figuring out how to do it from scratch myself. Some questions though:

- What was the reason this never got merged?  What changes are needed
to rectify that?
- Considering the earlier discussion, do we want to leave out the
actual -Xtheirs feature and just have -Xours and -Xsubtree?
- If I rebase them and the changes turn out to be minimal, do they
still need a signed-off-by Junio?  (He obviously owns part of the
copyright and has previously signed off, but he also won't have signed
off the rebased patches verbatim, so I'm confused.)
Thanks,
Avery
Previous: Junio C HamanoNext: Junio C Hamano
Message 6 of 12 in “git-subtree: directory mismatch”
  1. Marc FournierNov 24, 2009
  2. Avery PennarunNov 24, 2009
  3. Nanako ShiraishiNov 24, 2009
  4. Avery PennarunNov 25, 2009
  5. Junio C HamanoNov 25, 2009
  6. Avery PennarunNov 25, 2009
  7. Junio C HamanoNov 25, 2009
  8. Johannes SchindelinNov 25, 2009
  9. Avery PennarunNov 25, 2009
  10. Björn SteinbrinkNov 25, 2009
  11. Avery PennarunNov 25, 2009
  12. Marc FournierNov 25, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.