Re: Is there possible to integrate mtd ubi ubifs latest version in one git tree?

Artem Bityutskiy
2008-04-12T10:12:26Z

On Sat, 2008-04-12 at 12:57 +0300, Artem Bityutskiy wrote:
> If you do not want to loose UBIFS history, you could do like this
> # cd /home/nanxy/ubifs-v2.6.24
> # git format-patch v2.6.24
> This will give you huge amount of patches, basically all patches which
> we applied to vanilla linux-2.6.24. Now you may apply them to your
> linux-2.6.24.3. The easiest way is to use git-am. But first you have to
> make sure your linux-2.6.24.3 is a git repository. If it is not (you
> downloaded it as a tar.gz file, create a git repository using git
> init-db and then git commit).
>
> # cd /home/nancy/linux-2.6.24.3
> # git init-db
> # git add .
> # git-commit -a

Well, you might as well use quilt, which is an extremely helpful tool.
So you have many patches in /home/nanxy/ubifs-v2.6.24, like
"0061-UBIFS-use-qstr-for-name-length-pairs.patch". What you can do is:

# ls -1 0* > series
# cd /home/nancy/linux-2.6.24.3
# mkdir patches
# mv /home/nanxy/ubifs-v2.6.24/series patches/
# mv /home/nanxy/ubifs-v2.6.24/0* patches/
# quilt push -a

If there are conflicts, it is easier to resolve them with quilt. Often
it is just about "quilt push; quilt refresh".

Ant after you resolved all conflicts, and all patches apply cleanly (use
quilt refresh), you may incorporate all patches to git:

# quilt pop -q
# git reset --hard
# git quiltimport

And you now may delete patches/ and .pc which is private quilt working
directory.