How to import a mercury patch that has a different directory structure

I have a patch made with hg export 42in another repository that modifies files

asd/fgh/foo/bar.c
asd/fgh/foo/fish.h
boo/hoo.txt

I need to import this patch into a repository that has a structure such as:

src/foo/bar.c
src/foo/fish.h
boo/hoo.txt

Is there any command that can execute this - I can re-run hg exportin the old repo, if necessary, and I want to ignore files that have the same path (for example, boo/hoo.txt)

Initially, I thought hg import -p3 patch.diffto repository/srchave done this, but, apparently, he still wants to create a hierarchy asd/fgh/at the top level (and place it .rej files)

+3
source share
2 answers

- . , , , .

mercurial, , , "convert", , , , - hg convert --filemap thefilemap exportingrepo newexportingrepo, :

rename asd/fgh src

newexportingrepo .

, , .:)

+2

. , .

0

Source: https://habr.com/ru/post/1737659/


All Articles