view release on metacpan or  search on metacpan

t/50dav.t  view on Meta::CPAN

	   ["Committed revision 5."]);
$svk->smerge (-Cm => 'foo', -f => '//local/');

my $uuid = $repos->fs->get_uuid;

is_output ($svk, 'smerge', [-m => 'foo', -f => '//local/'],
	   ['Auto-merging (0, 5) /local to /remote (base /remote:3).',
	    "Merging back to mirror source $uri/A.",
	    'U   Q/qu',
	    'U   be',
	    "New merge ticket: $uuid:/local:5",
	    'Merge back committed as revision 3.',
	    "Syncing $uri/A",
	    'Retrieving log information from 3 to 3',
	    'Committed revision 6 from revision 3.']);
$svk->switch ('//remote', $copath);
append_file ("$copath/Q/qu", "More changes in iso-8859-1\n");
is_output ($svk, 'commit', [-m => "L\x{e9}on has a nice name.", $copath],
	   ["Can't decode commit message as $utf8.", "try --encoding."]);
is_output_like ($svk, 'commit', [-m => "L\x{e9}on has a nice name.", '--encoding', 'iso-8859-1', $copath],
		qr'Committed revision');

$svk->rm (-m => 'mkdir', '/test/A/Q');
$svk->mkdir (-m => 'mkdir', '//local/Q/foo');
set_editor(<< "TMP");
\$_ = shift;
open _ or die \$!;
\@_ = ("from editor\n", <_>);
close _;
unlink \$_;
open _, '>', \$_ or die \$!;
print _ \@_;
close _;
TMP

# when merge/commit failed, log message should be somewhere.

chdir ($copath);
$svk->sm(-f => '//local');
ok (my ($filename) = $output =~ m/saved in (.*)\./s);
is_file_content ($filename, "from editor\n");

$server->stop;
print "\n";


append_file ("be", "changes\n");

is_output ($svk, 'commit', [],
	   ['Waiting for editor...',
	    'Commit into mirrored path: merging back directly.',
	    "Merging back to mirror source $uri/A.",
	    qr'Commit message saved in (.*)\.',
	    qr"RA layer request failed: OPTIONS.*/svn/A.*",
           ]);

($filename) = $output =~ m/saved in (.*)\./s;
is_file_content ($filename, "from editor\n");

$uri = "file://$srepospath/A";
is_output ($svk, 'mi', ['--relocate', $uri, '//remote'],
	   ['Mirror relocated.']);

is_output ($svk, 'commit', [-m => 'go'],
	   ['Commit into mirrored path: merging back directly.',
	    "Merging back to mirror source $uri.",
	    'Merge back committed as revision 6.',
	    'Syncing '.$uri,
	    'Retrieving log information from 5 to 6',
	    'Committed revision 10 from revision 5.',
	    'Committed revision 11 from revision 6.']);