blob: a0ea9e464d14133f21757b47cc1ff52090b80e5e (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
$ mkdir -p d/d
$ cd d
$ quilt new snapshot
> Patch %{P}snapshot is now on top
$ cd d
$ quilt add f.txt
> File d/f.txt added to patch %{_P}snapshot
$ cat > f.txt
< f.txt
$ quilt add g.txt
> File d/g.txt added to patch %{_P}snapshot
$ cat > g.txt
< g.txt
$ quilt refresh
> Refreshed patch %{_P}snapshot
$ quilt snapshot
$ quilt fork
> Fork of patch %{_P}snapshot created as %{_P}snapshot-2
$ quilt remove g.txt
> File d/g.txt removed from patch %{_P}snapshot-2
$ quilt add h.txt
> File d/h.txt added to patch %{_P}snapshot-2
$ cat > h.txt
< h.txt
$ cat >> f.txt
< more changes
$ quilt refresh
> Refreshed patch %{_P}snapshot-2
$ quilt diff --snapshot | grep -v "^\\(---\\|+++\\)"
> Index: d/d/f.txt
> ===================================================================
> @@ -1 +1,2 @@
> f.txt
> +more changes
> Index: d/d/g.txt
> ===================================================================
> @@ -1 +0,0 @@
> -g.txt
> Index: d/d/h.txt
> ===================================================================
> @@ -0,0 +1 @@
> +h.txt
$ cd ../..
$ rm -rf d
|