SVK

 view release on metacpan or  search on metacpan

t/29update-props.t  view on Meta::CPAN

# different prop in outdated checkout
{
    $svk->ps ('another-prop', 'value', "$copath/A");
    is_output($svk, 'up', ['-C', $copath], [
        "Syncing //trunk(/trunk) in $corpath to 5.",
        __(" U  $copath/A"),
    ] );
    is_output($svk, 'up', [$copath], [
        "Syncing //trunk(/trunk) in $corpath to 5.",
        __(" U  $copath/A"),
    ] );
    is_output($svk, 'st', [$copath], [
        __(" M  $copath/A"),
    ] );
    is_output($svk, 'di', [$copath], [
        "",
        __("Property changes on: $copath/A"),
        "___________________________________________________________________",
        "Name: another-prop",
        " +value",
        "",
    ] );
}

flush_co_dir();

# conflict on update
{
    $svk->ps ('prop', 'another-value', "$copath/A");
    is_output($svk, 'up', ['-C', $copath], [
        "Syncing //trunk(/trunk) in $corpath to 5.",
        __(" C  $copath/A"),
        "1 conflict found.",
    ] );
    is_output($svk, 'up', [$copath], [
        "Syncing //trunk(/trunk) in $corpath to 5.",
        __(" C  $copath/A"),
        "1 conflict found.",
    ] );
    is_output($svk, 'st', [$copath], [
        __(" C  $copath/A"),
    ] );

    # XXX: this looks wierd a littl without line endings
    is_output($svk, 'di', [$copath], [
        "",
        __("Property changes on: $copath/A"),
        "___________________________________________________________________",
        "Name: prop",
        " -value",
        qr" \+>>>> YOUR VERSION Property prop of A \(/trunk\) \d+",
        qr" \+another-value==== ORIGINAL VERSION Property prop of A \d+",
        qr" \+==== THEIR VERSION Property prop of A \(/trunk\) \d+",
        qr" \+value<<<< \d+",
        " +",
        "",
    ] );
    # TODO: test resolved command, test ps command
}

# flush to required state: revert, update to revision before propset on //trunk
sub flush_co {
    $svk->revert('-R', $copath);
    $svk->up($copath);
    $svk->up('-r3', $copath);
    is_output($svk, 'up', ['-C', $copath], [
        #XXX, TODO: why it's corpath instead copath?
        "Syncing //trunk(/trunk) in $corpath to 4.",
        __(" U  $copath/me"),
    ] );
    is_output($svk, 'st', [$copath], [
    ] );
    is_output($svk, 'di', [$copath], [
    ] );
}

sub flush_co_dir {
    $svk->revert('-R', $copath);
    $svk->up($copath);
    $svk->up('-r4', $copath);
    is_output($svk, 'up', ['-C', $copath], [
        #XXX, TODO: why it's corpath instead copath?
        "Syncing //trunk(/trunk) in $corpath to 5.",
        __(" U  $copath/A"),
    ] );
    is_output($svk, 'st', [$copath], [
    ] );
    is_output($svk, 'di', [$copath], [
    ] );
}



( run in 0.540 second using v1.01-cache-2.11-cpan-71847e10f99 )