2288
|
1 |
=======
|
|
2 |
quilt
|
|
3 |
=======
|
|
4 |
.. contents::
|
|
5 |
:local:
|
|
6 |
|
|
7 |
Basic flow
|
|
8 |
==========
|
|
9 |
|
|
10 |
Basic Quilt flow::
|
|
11 |
|
|
12 |
$ cd $proj
|
|
13 |
$ quilt new my.patch
|
|
14 |
$ quilt add $file
|
|
15 |
$ $EDIT $file
|
|
16 |
$ quilt diff -z
|
|
17 |
$ quilt refresh
|
|
18 |
$ quilt pop
|
|
19 |
$ quilt push
|
|
20 |
|
2289
|
21 |
Folding patch
|
|
22 |
=============
|
|
23 |
::
|
|
24 |
|
|
25 |
quilt pop
|
|
26 |
quilt top
|
|
27 |
quilt fold < patches/fix-x.patch
|
|
28 |
quilt diff -z
|
|
29 |
quilt refresh
|
|
30 |
quilt delete -r fix-x.patch
|
|
31 |
|
|
32 |
Integrating local VCS changes
|
|
33 |
=============================
|
|
34 |
|
|
35 |
Integrating working directory changes from ``git``/``hg`` to ``quilt`` if they are in files
|
|
36 |
unmanaged by ``quilt``::
|
|
37 |
|
|
38 |
quilt pop -a
|
|
39 |
git st
|
|
40 |
git diff >patches/tmp.patch
|
|
41 |
git reset --hard
|
|
42 |
quilt push my.patch
|
|
43 |
quilt fold <patches/tmp.patch
|
|
44 |
quilt diff -z
|
|
45 |
quilt refresh
|
|
46 |
rm patches/tmp.patch
|
|
47 |
|
|
48 |
Rollback topmost changes
|
|
49 |
========================
|
|
50 |
|
|
51 |
Rollback topmost changes shown by ``quilt diff -z``::
|
|
52 |
|
|
53 |
quilt revert `quilt files`
|
|
54 |
|
|
55 |
Integrate changes into separate patch
|
|
56 |
=====================================
|
|
57 |
::
|
|
58 |
|
|
59 |
quilt refresh -zNAME.patch
|
|
60 |
|
|
61 |
Delete patch
|
|
62 |
============
|
|
63 |
::
|
|
64 |
|
|
65 |
quilt delete NAME.patch
|
|
66 |
|
|
67 |
Delete file from patch::
|
|
68 |
|
|
69 |
quilt remove -p NAME.patch FILE
|
|
70 |
quilt refresh
|
|
71 |
|
|
72 |
Delete file from patch
|
|
73 |
======================
|
|
74 |
::
|
|
75 |
|
|
76 |
quilt remove -p NAME.patch FILE
|
|
77 |
quilt refresh
|
|
78 |
|
|
79 |
Import patch
|
|
80 |
============
|
|
81 |
|
|
82 |
Import patch with non-p1 paths (like after ``svn diff``)::
|
|
83 |
|
|
84 |
svn diff >.diff
|
|
85 |
quilt import -p 0 -P .diff fix.patch
|
|
86 |
|