summaryrefslogblamecommitdiffstats
path: root/test/fold.test
blob: 331138a090eda4da4fb1141eccee04ddb0402ec1 (plain) (tree)






















                                   

                                    



                             

                                  





                                             
                                         

                                                                             
                       


                             

                                                                             
                       


                             


                  
	$ mkdir d
	$ cd d

	$ mkdir patches
	$ cat > patches/series
	< patch1.diff
	< patch2.diff
	
	$ cat > patches/patch1.diff
	< --- q.orig/file1.txt
	< +++ q/file1.txt
	< @@ -0,0 +1 @@
	< +This is file1.txt.
	< --- q.orig/file2.txt
	< +++ q/file2.txt
	< @@ -0,0 +1 @@
	< +This is file2.txt.

	$ cat > patches/patch2.diff
	< --- q.orig/file2.txt
	< +++ q/file2.txt
	< @@ -1 +0,0 @@
	< -This is file2.txt.
	< --- q.orig/dir/file3.txt  
	< +++ q/dir/file3.txt
	< @@ -0,0 +1 @@
	< +This is file3.txt.

	$ quilt push -q
	> Applying patch1.diff
	> Now at patch patch1.diff

	$ quilt files
	> file1.txt
	> file2.txt

	$ quilt fold -q < patches/patch2.diff
	$ quilt diff | sed -e "s/\\t.*//"
	> Index: d/dir/file3.txt
	> ===================================================================
	> --- /dev/null
	> +++ d/dir/file3.txt
	> @@ -0,0 +1 @@
	> +This is file3.txt.
	> Index: d/file1.txt
	> ===================================================================
	> --- /dev/null
	> +++ d/file1.txt
	> @@ -0,0 +1 @@
	> +This is file1.txt.

	$ cd ..
	$ rm -rf d