[Kde-scm-interest] Re: converting QMake plugin (was: importing subproject history)

[Torgny Nyblom]

On Tuesday 30 November 2010 01.17.16 Nicolas Alvarez wrote:
> Torgny Nyblom wrote:
[...]
> This worked fine. However, I'm getting into trouble with branches...
> 
> My basic rules for the pre-project-merge history look like this:
> 
> match /trunk/KDE/kdevelop/projectmanagers/qmake/
>   repository kdev-qmake
>   branch master
>   prefix qmake/
> end match
> 
> match /trunk/KDE/kdevelop/projectbuilders/qmakebuilder/
>   repository kdev-qmake
>   branch master
>   prefix qmakebuilder/
> end match
> 
> Now, there is a branch of qmake alone, also made before qmakebuilder
> got moved into qmake:
> 
> match /branches/work/kdevelop-qmake-duchain/
>   repository kdev-qmake
>   branch duchain
>   prefix qmake/
> end match
> 
> This works great for the qmake directory; however, the first git commit to
> the duchain branch deletes everything from qmakebuilder. I can't figure out
> how to get the qmakebuilder files to keep appearing in the duchain branch
> unmodified.

match /branches/work/kdevelop-qmake-duchain/qmakebuilder/
end match
match /branches/work/kdevelop-qmake-duchain/
  repository kdev-qmake
  branch duchain
  prefix qmake/
end match

That would ignore the qmakebuilder subdir, however you probably want to add a 
min/max revision so that you only match the deletion and not the creation.

/Regards
Torgny