source: project/chicken/trunk/misc/merge-branch @ 7936

Last change on this file since 7936 was 7936, checked in by felix winkelmann, 12 years ago

renamed script again

File size: 759 bytes
Line 
1#!/bin/sh
2#| merge-branch                                   -*- Scheme -*-
3exec csi -s "$0" "$@"
4|#
5
6(load-relative "build.scm")
7
8(define-constant +repobase+ "https://galinha.ucpel.tche.br/svn/chicken-eggs")
9
10(define (usage)
11  (print " usage: merge-branch [--dry-run] [--diff[=REVS]] [--repourl=URL] [--verbose] BRANCHFROM BRANCHTO [WC]")
12  (exit 1) )
13
14(define *dry-run* #f)
15(define *diff* #f)
16
17(define (do-merge b1 b2 #!optional (wc "."))
18  (run (svn
19        ,(if *diff*
20             `("diff" ,(if (string? *diff*) (conc "-r" *diff*) ""))
21             "merge")
22        ,(if *dry-run* "--dry-run" "")
23        ,(make-pathname +repobase+ b2)
24        ,(make-pathname +repobase+ b1)
25        ,(if (not *diff*) wc "") ) ) )
26
27(match (simple-args)
28  ((b1 b2 . wc) (apply do-merge b1 b2 wc))
29  (_ (usage)))
30
31(exit)
Note: See TracBrowser for help on using the repository browser.