summaryrefslogblamecommitdiffstats
path: root/test/snapshot2.test
blob: 89daa32546c77b0187984720644606302f371464 (plain) (tree)




























































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

	$ quilt new snapshot
	> Patch snapshot is now on top
	$ quilt add f.txt
	> File d/f.txt added to patch snapshot
	$ cat > f.txt
	< f.txt

	$ quilt add g.txt
	> File d/g.txt added to patch snapshot
	$ cat > g.txt
	< g.txt

	$ quilt refresh
	> Refreshed patch snapshot
	$ quilt snapshot
	$ quilt pop -q
	> Removing snapshot
	> No patches applied

	$ quilt fork
	> Fork of patches/snapshot created as patches/snapshot-2

	$ quilt push -q
	> Applying snapshot-2
	> Now at patch snapshot-2

	$ quilt remove g.txt
	> File d/g.txt removed from patch snapshot-2

	$ quilt add h.txt
	> File d/h.txt added to patch snapshot-2

	$ cat > h.txt
	< h.txt

	$ cat >> f.txt
	< more changes

	$ quilt refresh
	> Refreshed patch 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