← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to contrib/pwk

  • Committer: Aaron Bentley
  • Date: 2007-06-22 22:19:13 UTC
  • mto: (2520.5.2 bzr.mpbundle)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070622221913-mcjioqruw8rhgnd8
Improve locking in _BaseMergeDirective.from_object

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/pwk
10
10
PWK_ROOT='http://patchwork.ozlabs.org/bazaar-ng'
11
11
PWK_AUTH_ROOT='https://patchwork.ozlabs.org/bazaar-ng'
12
12
 
13
 
# bzr uses -p0 style; others use -p1
14
 
PATCH_OPTS='-p0'
15
 
 
16
13
usage() {
17
14
    cat <<EOF
18
15
usage: 
42
39
    catpatch $2 | ${PAGER:-less}
43
40
    ;;
44
41
try)
45
 
    catpatch $2 | patch -p0 --dry-run
 
42
    catpatch $2 | patch -p1 --dry-run
46
43
    ;;
47
44
apply)
48
 
    catpatch $2 | patch -p0
 
45
    catpatch $2 | patch -p1
49
46
    ;;
50
47
*)
51
48
    usage
52
49
    exit 1
53
 
esac
 
 
b'\\ No newline at end of file'
 
50
esac