summaryrefslogblamecommitdiffstats
path: root/test/reorder.test
blob: b592932185c417ae9f8ef0aca22a395b2c4f48f8 (plain) (tree)
1
2
3
4
5
6
7
8
9
10







                                                    

                    


                     

                    






                              

                                

                      
                            




                                  

                    




                       

                                

                     
           
           

           






                                        

                  
Regression test: Quilt did reorder files in patches.

	$ mkdir d
	$ cd d
	$ echo one > f
	$ echo one > g
	$ mkdir patches
	$ cat > patches/test.diff
	< --- g.orig
	< +++ g
	< @@ -1 +1 @@
	< -one
	< +two
	< --- f.orig
	< +++ f
	< @@ -1 +1 @@
	< -one
	< +two

	$ cat > patches/series
	< test.diff -p0
	$ quilt push -q
	> Applying test.diff
	> Now at patch test.diff

	$ quilt pop -q
	> Removing test.diff
	> No patches applied

	$ echo one > h
	$ sleep 2
	$ cat >> patches/test.diff
	< --- h.orig
	< +++ h
	< @@ -1 +1 @@
	< -one
	< +two

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

	$ quilt files
	> f
	> g
	> h

	$ quilt refresh
	> Refreshed patch test.diff
	$ grep "^+++ " patches/test.diff
	> +++ f
	> +++ g
	> +++ h

	$ cd ..
	$ rm -rf d