new.test

linux下各种patch的管理工具

	$ rm -rf d
	$ mkdir -p d/patches
	$ cd d

	$ echo reject > f
	$ echo p.diff > patches/series
	$ cat > patches/p.diff
	< --- d.orig/f
	< +++ d/f
	< @@ -1 +1 @@
	< -old
	< +new
	< --- d.orig/g
	< +++ d/g
	< @@ -0,0 +1 @@
	< +added


	$ quilt push
	> Applying patch %{P}p.diff
	>~ patching file `?f'?
	> Hunk #1 FAILED at 1.
	>~ 1 out of 1 hunk FAILED -- rejects in file `?f'?
	>~ patching file `?g'?
	> Patch %{P}p.diff does not apply (enforce with -f)

	$ quilt push -f
	> Applying patch %{P}p.diff
	>~ patching file `?f'?
	> Hunk #1 FAILED at 1.
	>~ 1 out of 1 hunk FAILED -- saving rejects to (file )?`?f.rej'?
	>~ patching file `?g'?
	> Applied patch %{P}p.diff (forced; needs refresh)

	$ echo new > f
	$ quilt refresh
	> Refreshed patch %{P}p.diff
	$ cat patches/p.diff
	> Index: d/f
	> ===================================================================
	> --- d.orig/f
	> +++ d/f
	> @@ -1 +1 @@
	> -reject
	> +new
	> Index: d/g
	> ===================================================================
	> --- /dev/null
	> +++ d/g
	> @@ -0,0 +1 @@
	> +added

	$ cd ..
	$ rm -rf d