[svk-commit] r2953 - trunk/t

[nobody at bestpractical.com]

Author: ruz
Date: Thu Jul  3 04:00:51 2008
New Revision: 2953

Modified:
   trunk/t/10switch-merge-ticket.t
   trunk/t/29update-merge-ticket.t

Log:
* change tests

Modified: trunk/t/10switch-merge-ticket.t
==============================================================================
--- trunk/t/10switch-merge-ticket.t	(original)
+++ trunk/t/10switch-merge-ticket.t	Thu Jul  3 04:00:51 2008
@@ -10,20 +10,27 @@
 my ($xd, $svk) = build_test();
 our $output;
 my ($copath, $corpath) = get_copath ('smerge');
+my (undef, undef, $repos) = $xd->find_repos ('//', 1);
+my $uuid = $repos->fs->get_uuid;
+
 $svk->mkdir ('-m', 'trunk', '//trunk');
 my $tree = create_basic_tree ($xd, '//trunk');
 $svk->cp ('-m', 'branch', '//trunk', '//local');
 $svk->cp ('-m', 'branch', '//local', '//local-another');
 $svk->cp ('-m', 'branch', '//local-another', '//local-another-local');
+
+# change //trunk/me
 $svk->co ('//trunk', $copath);
 append_file("$copath/me", "a change\n");
 $svk->ci ('-m', 'change file', $copath );
 
+# change //local-another-local/A/be and merge into //local-another
 $svk->switch ('//local-another-local', $copath);
 append_file("$copath/A/be", "a change\n");
 $svk->ci ('-m', 'change file', $copath );
 $svk->sm ('-Il', '//local-another-local', '//local-another' );
 
+# merge //trunk into up to date checkout of //local
 $svk->switch ('//local', $copath);
 $svk->sm ('//trunk', $copath);
 
@@ -42,7 +49,10 @@
     'Property changes on: t/checkout/smerge',
     '___________________________________________________________________',
     'Name: svk:merge',
-    ' -006e7783-1232-49bc-9c32-34e58aa7cb2d:/trunk:3',
-    ' +006e7783-1232-49bc-9c32-34e58aa7cb2d:/trunk:7',
+    "  $uuid:/local:4",
+    "  $uuid:/local-another-local:8",
+    " -$uuid:/trunk:3",
+    " +$uuid:/trunk:7",
+    ""
     ]
 );

Modified: trunk/t/29update-merge-ticket.t
==============================================================================
--- trunk/t/29update-merge-ticket.t	(original)
+++ trunk/t/29update-merge-ticket.t	Thu Jul  3 04:00:51 2008
@@ -10,6 +10,9 @@
 my ($xd, $svk) = build_test();
 our $output;
 my ($copath, $corpath) = get_copath ('smerge');
+my (undef, undef, $repos) = $xd->find_repos ('//', 1);
+my $uuid = $repos->fs->get_uuid;
+
 $svk->mkdir ('-m', 'trunk', '//trunk');
 my $tree = create_basic_tree ($xd, '//trunk');
 $svk->cp ('-m', 'branch', '//trunk', '//local');
@@ -41,8 +44,9 @@
     'Property changes on: t/checkout/smerge',
     '___________________________________________________________________',
     'Name: svk:merge',
-    ' -006e7783-1232-49bc-9c32-34e58aa7cb2d:/trunk:3',
-    ' +006e7783-1232-49bc-9c32-34e58aa7cb2d:/trunk:6',
+    "  $uuid:/local-another:7",
+    " -$uuid:/trunk:3",
+    " +$uuid:/trunk:6",
+    ""
     ]
 );
-