0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use -z4; support for merging changes between arbitrary tags

Browse source
This commit is contained in:
Yann Dirson 2004-08-13 20:38:05 +00:00
parent 7bbf92221c
commit 991a71133f
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
utils/cvsmerge
View file

@ -35,16 +35,26 @@ our @nonbindirs;
## parse command line
die "must give only a syncpoint tag as argument"
unless @ARGV == 1 and $ARGV[0] =~ m/^(syncpoint_.*_)(\d+)$/;
our ($basetag, $targettag);
if (@ARGV == 1) {
die "single argument must be a syncpoint tag"
unless $ARGV[0] =~ m/^(syncpoint_.*_)(\d+)$/;
my ($tagroot, $target) = ($1, $2);
$targettag = $ARGV[0];
$basetag = $tagroot . ($target-1) if $target > 1;
} elsif (@ARGV == 2) {
($basetag, $targettag) = @ARGV;
} else {
die "this script wants 1 or 2 arguments";
}
our ($basetag, $target) = ($1, $2);
## base of the command
our $basecmd = 'cvs -f upd -dP ';
$basecmd .= '-j syncpoint_gettext1_' . ($target-1) . ' ' if $target > 1;
$basecmd .= '-j syncpoint_gettext1_' . $target . ' ';
our $basecmd = 'cvs -f upd -dP -z4 ';
$basecmd .= '-j ' . $basetag . ' ' if defined $basetag;
$basecmd .= '-j ' . $targettag . ' ';
## do merge