summaryrefslogblamecommitdiffstats
path: root/test/annotate.test
blob: 495275c1eb21ee9601c5a523666db63ad5cb4d30 (plain) (tree)
1
2
3
4
5
6
7
8
9
                       
 





                         
                                       

                       
                                           
 

                                       
                       
                                   





                            
                         

                          
                                        
 
                       
                                            
 

                                           
                       
                                    





                            

                          

                          
                                        

                       
                                            
 

                                       
                       
                                    




                            


                          
 
                                      


                   


                          
 
                                      



                   

                          
 
                                     



                   
                         
 
                          
                                        





                           

                                            
 
                   




                       
                                    


                            
                          




                            
                          
	$ mkdir patches

	$ cat > foo
	< foo
	< bar
	< baz

	$ quilt new patch
	> Patch %{P}patch is now on top

	$ quilt add foo
	> File foo added to patch %{P}patch

	$ sed -e 's:b:B:' foo > foo.new
	$ mv foo.new foo
	$ quilt refresh
	> Refreshed patch %{P}patch

	$ quilt annotate foo
	>	foo
	> 1	Bar
	> 1	Baz
	>
	> 1	%{P}patch

	$ quilt new patch2
	> Patch %{P}patch2 is now on top

	$ quilt add foo
	> File foo added to patch %{P}patch2

	$ sed -e 's:Baz:baz:' foo > foo.new
	$ mv foo.new foo
	$ quilt refresh
	> Refreshed patch %{P}patch2

	$ quilt annotate foo
	>	foo
	> 1	Bar
	> 2	baz
	>
	> 1	%{P}patch
	> 2	%{P}patch2

	$ quilt new patch3
	> Patch %{P}patch3 is now on top

	$ quilt add foo
	> File foo added to patch %{P}patch3

	$ sed -e '/Bar/d' foo > foo.new
	$ mv foo.new foo
	$ quilt refresh
	> Refreshed patch %{P}patch3

	$ quilt annotate foo
	>	foo
	> 2	baz
	>
	> 1	%{P}patch
	> 2	%{P}patch2
	> 3	%{P}patch3

	$ quilt annotate -P patch3 foo
	>	foo
	> 2	baz
	>
	> 1	%{P}patch
	> 2	%{P}patch2
	> 3	%{P}patch3

	$ quilt annotate -P patch2 foo
	>	foo
	> 1	Bar
	> 2	baz
	>
	> 1	%{P}patch
	> 2	%{P}patch2

	$ quilt annotate -P patch foo
	>	foo
	> 1	Bar
	> 1	Baz
	>
	> 1	%{P}patch

	$ quilt new patch4
	> Patch %{P}patch4 is now on top

	$ cat > jkl
	< abc
	< def

	$ quilt add jkl wrz
	> File jkl added to patch %{P}patch4
	> File wrz added to patch %{P}patch4

	$ rm -f jkl
	$ cat > wrz
	< one
	< two

	$ quilt refresh
	> Refreshed patch %{P}patch4

	$ quilt annotate jkl
	>
	> 1	%{P}patch4

	$ quilt annotate wrz
	> 1	one
	> 1	two
	>
	> 1	%{P}patch4