← Back to branch summary

~ubuntu-dev/ubuntu/lucid/quilt/lucid-201002101907

« back to all changes in this revision

Viewing changes to test/remove.test

  • Committer: Bazaar Package Importer
  • Author(s): Raphaël Hertzog, Martin Quinson, Raphaël Hertzog, Ryan Niebur
  • Date: 2009-09-02 22:05:25 UTC
  • mfrom: (1.2.6 upstream)
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20090902220525-zhckxgbs9wqhyw83
https://launchpad.net/bugs/402237
http://bugs.debian.org/544668
[ Martin Quinson ]
* New upstream release.
* debian/patches/generic-awk: removed since merged upstream.
* debian/patches/*: updated so that they apply again on this release.

[ Raphaël Hertzog ]
* Remove Simon Hormans from Uploaders with his permission.
* debian/patches/fix-manpage-generation: fix Makefile so that
  the manual page is correctly generated with dash too (LP: #402237)
* Improve dh_quilt_patch/unpatch by respecting the QUILT_PATCH_DIR
  environment variable like /usr/share/quilt/quilt.make does.
  Closes: #544668

[ Ryan Niebur ]
* Add myself to Uploaders
* fixes to the arch_all patch to pass test suite
  - port upstream changes to the c version to the bash rewrite
    of backup-files
  - fix backup-files to process all files passed in on the
    command line instead of just the last (a clear bug)
* refresh all patches with -p ab
* add procmail to build deps, needed by tests
* Debian Policy 3.8.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/remove.test
1
 
        $ rm -rf d
2
 
        $ mkdir -p d/patches
3
 
        $ cd d
4
 
 
5
 
        $ echo f1 > f
6
 
        $ echo g1 > g
7
 
        $ quilt new p.diff
8
 
        > Patch patches/p.diff is now on top
9
 
 
10
 
        $ quilt add f g h
11
 
        > File f added to patch patches/p.diff
12
 
        > File g added to patch patches/p.diff
13
 
        > File h added to patch patches/p.diff
14
 
 
15
 
        $ echo h1 > h
16
 
        $ rm -f g
17
 
        $ quilt refresh
18
 
        > Refreshed patch patches/p.diff
19
 
 
20
 
        $ quilt remove f
21
 
        > File f removed from patch patches/p.diff
22
 
 
23
 
        $ quilt diff -z
24
 
        $ quilt pop -qf
25
 
        > Removing patch patches/p.diff
26
 
        > No patches applied
27
 
 
28
 
        $ quilt push -q
29
 
        > Applying patch patches/p.diff
30
 
        > Now at patch patches/p.diff
31
 
 
32
 
        $ quilt remove g
33
 
        > File g removed from patch patches/p.diff
34
 
 
35
 
        $ quilt diff -z
36
 
        $ quilt pop -qf
37
 
        > Removing patch patches/p.diff
38
 
        > No patches applied
39
 
 
40
 
        $ quilt push -q
41
 
        > Applying patch patches/p.diff
42
 
        > Now at patch patches/p.diff
43
 
 
44
 
        $ quilt remove h
45
 
        > File h removed from patch patches/p.diff
46
 
 
47
 
        $ quilt diff -z
48
 
 
49
 
        $ cd ..
50
 
        $ rm -rf d