fsl wrapper

Check-in [5c88202476]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Added additional constraint on calculating the forks. I don't 100% understand the schema and model but this seems to fix some false postives we are seeing
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:5c8820247608c42d7dda594a8515bf306d78a269
User & Date: mrwellan 2012-05-08 20:25:58
Context
2012-05-08
20:26
Bumped version check-in: 3a251dc9b7 user: mrwellan tags: trunk, v1.22d
20:25
Added additional constraint on calculating the forks. I don't 100% understand the schema and model but this seems to fix some false postives we are seeing check-in: 5c88202476 user: mrwellan tags: trunk
2012-05-02
15:34
added VERSION to header check-in: e29b0ba322 user: jmgedge tags: trunk, v1.22c
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to scripts/fsl.

416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
function fsl_conflicts () {
    export CONFLICT_FLAG_FILE=`mktemp`
    $FOSSILEXE "$@" | sed -r 's/^EDITED(\s+)(.*)/grep -q "< BEGIN MERGE CONFLICT:" "\2" \&\& rm -f $CONFLICT_FLAG_FILE \&\& echo "CONFLICT   \2" || echo "\0"/e'; 
}

# check for forks
function fsl_fork_find {
    forks=`echo "SELECT tagxref.value FROM leaf, tagxref WHERE leaf.rid=tagxref.rid and tagxref.value != '' group by tagxref.value having count(tagxref.value) > 1;"|$FOSSILEXE sql`
    if [ "x$forks" != "x" ]; then
        echo
        echo "WARNING!!! Fork(s) detected on $forks, use \"fsl leaves\" and \"fsl merge\" to find and correct."
        echo
    fi
}








|







416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
function fsl_conflicts () {
    export CONFLICT_FLAG_FILE=`mktemp`
    $FOSSILEXE "$@" | sed -r 's/^EDITED(\s+)(.*)/grep -q "< BEGIN MERGE CONFLICT:" "\2" \&\& rm -f $CONFLICT_FLAG_FILE \&\& echo "CONFLICT   \2" || echo "\0"/e'; 
}

# check for forks
function fsl_fork_find {
    forks=`echo "SELECT tagxref.value FROM leaf, tagxref WHERE leaf.rid=tagxref.rid and tagxref.value != '' and srcid != 0 group by tagxref.value having count(tagxref.value) > 1;"|$FOSSILEXE sql`
    if [ "x$forks" != "x" ]; then
        echo
        echo "WARNING!!! Fork(s) detected on $forks, use \"fsl leaves\" and \"fsl merge\" to find and correct."
        echo
    fi
}