patches between different repositories

Matthias Lehmann· May 3, 2010, 17:47 UTC · lore

Hi all,

I have to apply patches from one repository to another repository, which have a different layout (I am working on splitting one big repository into several smaller ones, while development still continues on the big repository).

So I did

big-repo$ git format-patche -o /tmp/foo @{some-date} -- subdir small-repo$ git apply -p2 --directory=some/path --check /tmp/foo/*

and get

fatal: git diff header lacks filename information when removing 2 leading pathname components (line 37)

the patch looks like this:

It seems, like the -p options to git-apply can't handle new files.

Am I doing something wrong here? Or is there another way to merge changes within different repositories with differnt layouts?

Any help would be greatly appreciated.

Best regards,

Matthias

Dmitrijs Ledkovs· May 3, 2010, 18:04 UTC · re: Matthias Lehmann · lore

Re: patches between different repositories

On 3 May 2010 18:47, Matthias Lehmann <mat@matlehmann.de> wrote:

> Am I doing something wrong here? Or is there another way to merge changes
> within different repositories with differnt layouts?
>
> Any help would be greatly appreciated.

Try sub-tree merge after the initial setup you will get another repository as a subdirectory after that you can commit moving files around to match different layout. After that you can just pull & merge and everything will just work =)

Read $ git help merge