From: "Shawn O. Pearce" <spearce@spearce•org>
To: Avery Pennarun <apenwarr@gmail•com>
Cc: Linus Torvalds <torvalds@linux-foundation•org>,
Robin Rosenberg <robin.rosenberg.lists@dewire•com>,
Ittay Dror <ittayd@tikalk•com>,
git@vger•kernel.org
Subject: Re: merge renamed files/directories?
Date: Mon, 5 May 2008 21:46:37 -0400 [thread overview]
Message-ID: <20080506014636.GM29038@spearce.org> (raw)
In-Reply-To: <32541b130805051838k367c44bau715774b46f7894cb@mail.gmail.com>
Avery Pennarun <apenwarr@gmail•com> wrote:
>
> I have a branch called 'mylib' with my library project in its root
> directory. What I wanted was to maintain my library in the 'mylib'
> branch, then merge my library into the "libs/mylib" directory of my
> application, which is in the 'myapp' branch. [...]
>
> This actually works like magic in git - except when you create a file
> in the 'mylib' branch, in which case it gets merged to the wrong path
> every single time. It seems to me like it should be very easy to put
> it in the right place instead, making one more interesting use case
> possible.
>
> I realize git-submodule is the way you're supposed to do something
> like this, but git-submodule doesn't really do what I want (yet) for
> reasons discussed in other threads.
`git pull -s subtree mylib` ?
This is how git-gui and gitk are merged into git.git, and it avoids
this case by looking for a subdirectory rename, more specifically
a rename of "/" to "mylib/".
It also can go the other way, that is rename "mylib/" to "/", but
this path is never used as far as I know as git-gui and gitk don't
ever merge in the git.git history.
--
Shawn.
next prev parent reply other threads:[~2008-05-06 1:47 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-01 14:10 detecting rename->commit->modify->commit Ittay Dror
2008-05-01 14:45 ` Jeff King
2008-05-01 15:08 ` Ittay Dror
2008-05-01 15:20 ` Jeff King
2008-05-01 15:30 ` Ittay Dror
2008-05-01 15:38 ` Jeff King
2008-05-01 15:47 ` Jakub Narebski
2008-05-01 20:39 ` Teemu Likonen
2008-05-01 23:09 ` Jeff King
2008-05-02 2:06 ` Sitaram Chamarty
2008-05-02 2:38 ` Junio C Hamano
2008-05-02 16:59 ` Sitaram Chamarty
2008-05-01 15:24 ` Ittay Dror
2008-05-01 15:28 ` Jeff King
2008-05-01 14:54 ` Ittay Dror
2008-05-01 15:09 ` Jeff King
2008-05-01 15:20 ` Ittay Dror
2008-05-01 15:30 ` David Tweed
2008-05-01 15:27 ` Avery Pennarun
2008-05-01 15:34 ` Jeff King
2008-05-01 15:50 ` Avery Pennarun
2008-05-01 16:48 ` Jeff King
2008-05-01 19:45 ` Avery Pennarun
2008-05-01 22:42 ` Jeff King
2008-05-01 19:12 ` Steven Grimm
2008-05-01 23:14 ` Jeff King
2008-05-03 17:56 ` merge renamed files/directories? (was: Re: detecting rename->commit->modify->commit) Ittay Dror
2008-05-03 18:11 ` Avery Pennarun
2008-05-04 6:08 ` merge renamed files/directories? Ittay Dror
2008-05-04 9:34 ` Jakub Narebski
2008-05-05 16:40 ` Avery Pennarun
2008-05-05 21:49 ` Robin Rosenberg
2008-05-05 22:20 ` Linus Torvalds
2008-05-05 23:07 ` Steven Grimm
2008-05-06 0:29 ` Linus Torvalds
2008-05-06 0:40 ` Linus Torvalds
2008-05-06 15:47 ` Theodore Tso
2008-05-06 16:10 ` Linus Torvalds
2008-05-06 16:15 ` Linus Torvalds
2008-05-06 16:32 ` Ittay Dror
2008-05-06 16:39 ` Linus Torvalds
2008-05-06 1:38 ` Avery Pennarun
2008-05-06 1:46 ` Shawn O. Pearce [this message]
2008-05-06 1:58 ` Avery Pennarun
2008-05-06 2:12 ` Shawn O. Pearce
2008-05-06 2:19 ` Linus Torvalds
2008-05-08 18:17 ` detecting rename->commit->modify->commit Jeff King
2008-05-01 16:39 ` Sitaram Chamarty
2008-05-01 18:58 ` Ittay Dror
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=20080506014636.GM29038@spearce.org \
--to=spearce@spearce$(echo .)org \
--cc=apenwarr@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=ittayd@tikalk$(echo .)com \
--cc=robin.rosenberg.lists@dewire$(echo .)com \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox