Changeset 7935 in project


Ignore:
Timestamp:
01/26/08 00:37:25 (12 years ago)
Author:
felix winkelmann
Message:

renamed merge script

File:
1 moved

Legend:

Unmodified
Added
Removed
  • chicken/trunk/misc/merge-chicken-branch

    r7930 r7935  
    11#!/bin/sh
    2 #| merge-from-trunk                                   -*- Scheme -*-
     2#| merge-branch                                   -*- Scheme -*-
    33exec csi -s "$0" "$@"
    44|#
    55
    6 
    7 ; usage: merge-from-trunk [--dry-run] [--diff[=REVS]] [--commit] [--repourl=URL] [--verbose]
    8 
    9 
    106(load-relative "build.scm")
    117
    12 (define *repourl* "https://galinha.ucpel.tche.br/svn/chicken-eggs")
     8(define-constant +repobase+ "https://galinha.ucpel.tche.br/svn/chicken-eggs")
     9
     10(define (usage)
     11  (print " usage: merge-chicken-branch [--dry-run] [--diff[=REVS]] [--repourl=URL] [--verbose] BRANCH1 BRANCH2 [WC]")
     12  (exit 1) )
     13
    1314(define *dry-run* #f)
    1415(define *diff* #f)
    15 (define *commit* #f)
    1616
    17 (simple-args)
     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+ b2)
     25        ,(if (not *diff*) wc "") ) ) )
    1826
    19 (run (svn
    20       ,(if *diff*
    21            `("diff" ,(if (string? *diff*) (conc "-r" *diff*) ""))
    22            "merge")
    23       ,(if *dry-run* "--dry-run" "")
    24       ,(conc *repourl* "/chicken/branches/release")
    25       ,(conc *repourl* "/chicken/trunk")
    26       ,(if (not *diff*) "." "") ) )
    27 
    28 (when *commit*
    29   (run (svn ci)) )
     27(match (simple-args)
     28  ((b1 b2 . wc) (apply do-merge b1 b2 wc))
     29  (_ (usage)))
    3030
    3131(exit)
Note: See TracChangeset for help on using the changeset viewer.