← Back to branch summary

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

« back to all changes in this revision

Viewing changes to test/revert.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/revert.test
 
1
        $ rm -rf d
 
2
        $ mkdir -p d/patches
 
3
        $ cd d
 
4
 
 
5
        $ mkdir sub
 
6
        $ echo f1 > sub/f
 
7
        $ echo g1 > sub/g
 
8
        $ quilt new p.diff
 
9
        > Patch patches/p.diff is now on top
 
10
 
 
11
        $ quilt add sub/f sub/g sub/h
 
12
        > File sub/f added to patch patches/p.diff
 
13
        > File sub/g added to patch patches/p.diff
 
14
        > File sub/h added to patch patches/p.diff
 
15
 
 
16
        $ rm -f sub/g
 
17
        $ echo h1 > sub/h
 
18
        $ quilt refresh
 
19
        > Refreshed patch patches/p.diff
 
20
 
 
21
        $ cd sub
 
22
        $ echo f2 > f
 
23
        $ quilt revert f
 
24
        > Changes to sub/f in patch ../patches/p.diff reverted
 
25
 
 
26
        $ quilt diff -z
 
27
        $ quilt pop -qf
 
28
        > Removing patch ../patches/p.diff
 
29
        > No patches applied
 
30
 
 
31
        $ quilt push -q
 
32
        > Applying patch ../patches/p.diff
 
33
        > Now at patch ../patches/p.diff
 
34
 
 
35
        $ echo g2 > g
 
36
        $ quilt revert g
 
37
        > Changes to sub/g in patch ../patches/p.diff reverted
 
38
 
 
39
        $ quilt diff -z
 
40
        $ quilt pop -qf
 
41
        > Removing patch ../patches/p.diff
 
42
        > No patches applied
 
43
 
 
44
        $ quilt push -q
 
45
        > Applying patch ../patches/p.diff
 
46
        > Now at patch ../patches/p.diff
 
47
 
 
48
        $ echo h2 > h
 
49
        $ quilt revert h
 
50
        > Changes to sub/h in patch ../patches/p.diff reverted
 
51
 
 
52
        $ quilt diff -z
 
53
 
 
54
        $ cd ../..
 
55
        $ rm -rf d