[svk-devel] Ticket #27459 delete does not work in folders in SVK
2.0 for Win32!
Jared Hardy
jaredhardy at gmail.com
Fri Feb 9 22:35:53 EST 2007
On 2/9/07, Jared Hardy <jaredhardy at gmail.com> wrote:
> > On 09/02/07, Jared Hardy <jaredhardy at gmail.com> wrote:
> > > Ticket #27459 has already been submitted. I am using SVK 2.0 under
> > > WindowsXP SP2. I wanted to bring this to attention, because it seems
> > > like a very serious bug. It leaves the config file in a corrupt
> > > state, and leaves the repository(s) in an unexpected state relative to
> > > the working copy.
> >
> On 2/9/07, Chia-Liang Kao <clkao at clkao.org> wrote:
> > If you run the test t/21delete.t included in the dist, does it pass?
>
> It does if I use the perl.exe used in the distribution. It doesn't if
> I use the first perl.exe in my path, which is from an old ActiveState
> Perl installation.
I fixed the path problem, so that particular 21delete.t test is
passing now, but I get a lot of other errors when running the full
maketest.bat script (attached text file). I am also still getting the
same error on deleting folders.
Jared
-------------- next part --------------
t\00use......................# Subversion 1.4.2
skipped
all skipped: MANIFEST does not exist
t\01depotmap.................ok
t\01editor...................ok
t\01help.....................skipped
all skipped: MANIFEST not exists
t\01init.....................ok
t\01pod......................skipped
all skipped: Test::Pod 1.00 required for testing POD
t\02basic-symlink............skipped
all skipped: symlink not supported
t\02basic....................ok
t\03import-mime..............ok
2/2 skipped: various reasons
t\03import-nomime............ok 1/2
# Failed test 'pl -v //import/mime/empty.txt //import/mime/false.bin //import/mime/foo.bin //i
mport/mime/foo.c //import/mime/foo.html //import/mime/foo.jpg //import/mime/foo.pl //import/mime
/foo.txt //import/mime/not-audio.txt'
t\03import-nomime............NOK 2/2# at t\03import-nomime.t line 23.
# Structures begin differing at:
# $got->[4] = 'Properties on //import/mime/foo.pl:'
# $expected->[4] = Does not exist
# Looks like you failed 1 test of 2.
t\03import-nomime............dubious
Test returned status 1 (wstat 256, 0x100)
DIED. FAILED test 2
Failed 1/2 tests, 50.00% okay
t\03import...................ok
t\04merge-rename.............ok
t\04merge....................ok
t\05svm-all..................ok
t\05svm-copy.................ok
t\05svm-empty................ok
t\05svm-head.................ok
t\05svm-lock.................skipped
all skipped: Doesn't work on win32
t\05svm-move.................ok
t\05svm-rm...................ok
t\05svm-skipped..............ok
t\05svm......................ok 24/29# uncleaned txns (3) on //
t\05svm......................ok
4/29 skipped: various reasons
t\06keyword..................ok
4/27 skipped: various reasons
t\07smerge-anchor-replace....ok
t\07smerge-anchor............ok 2/5# uncleaned txns (2) on //
t\07smerge-anchor............ok
t\07smerge-baseless..........ok
t\07smerge-bidi-inc..........ok 6/6# uncleaned txns (4) on //
t\07smerge-bidi-inc..........ok
t\07smerge-branch-renamed....ok
t\07smerge-copy-co...........ok
1/4 unexpectedly succeeded
TODO PASSED test 2
t\07smerge-copy..............ok
t\07smerge-delete............ok
t\07smerge-external..........ok
t\07smerge-file..............ok
t\07smerge-foreign...........ok
t\07smerge-incremental.......ok 11/11# uncleaned txns (6) on //
t\07smerge-incremental.......ok
t\07smerge-log...............ok
t\07smerge-mixanchor.........ok
t\07smerge-multi.............ok
t\07smerge-prop..............ok
t\07smerge-relayed...........ok
t\07smerge-rename............ok
t\07smerge-to-from...........ok
t\07smerge-tree..............ok
t\07smerge-upload............ok
t\07smerge...................ok 29/31# uncleaned txns (7) on //
t\07smerge...................ok
t\09cmerge...................ok
t\10switch...................ok
t\11checkout.................ok
5/69 skipped: various reasons
t\12copy-cache...............ok
t\12copy.....................ok
t\13patch....................ok
t\14move.....................ok
t\18replaced.................ok
t\19cleanup..................ok
1/15 skipped: various reasons
t\20add-filetype.............ok
2/2 skipped: various reasons
t\20add-libmagic.............ok
2/2 skipped: various reasons
t\20add-mmagic...............ok
2/2 skipped: various reasons
t\20add-nomime...............ok 1/2
t\20add-nomime...............NOK 2/2# Failed test 'pl -v mime/empty.txt mime/false.bin mime/fo
o.bin mime/foo.c mime/foo.html mime/foo.jpg mime/foo.pl mime/foo.txt mime/not-audio.txt'
# at t\20add-nomime.t line 31.
# Structures begin differing at:
# $got->[4] = 'Properties on mime\foo.pl:'
# $expected->[4] = Does not exist
# Looks like you failed 1 test of 2.
t\20add-nomime...............dubious
Test returned status 1 (wstat 256, 0x100)
DIED. FAILED test 2
Failed 1/2 tests, 50.00% okay
t\20add......................ok 24/35
t\20add......................NOK 34/35# Failed test 'pl -v A/autoprop/foo.bar A/autoprop/foo.p
l A/autoprop/foo.txt'
# at t\20add.t line 179.
# Structures begin differing at:
# $got->[2] = ' svn:executable: *'
# $expected->[2] = ' svn:mime-type: text/perl'
# Looks like you failed 1 test of 35.
t\20add......................dubious
Test returned status 1 (wstat 256, 0x100)
DIED. FAILED test 34
Failed 1/35 tests, 97.14% okay (less 2 skipped tests: 32 okay, 91.43%)
t\21delete...................ok
t\22status-conflict..........ok
t\22status...................ok
t\23commit-file..............ok
t\23commit-inter-nav.........ok 5/53prompt mismatch (--- A/deep/mas (revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
-po
+wy
kra
czny
[1/4] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties > ) vs (--- A/deep/mas (revisio
n 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
-po
+wy
kra
czny
[1/4] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 6)\x{a}+++ A/deep/mas\x{9}(local)\x{a}
@@ -0,2 +0...', 'Regexp=SCALAR(0x24ba998)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x24b3e
b8)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x246c9d
0)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x24
b411c)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24b48f0)', 'SVK::Path
::Checkout=HASH(0x24ba110)', 'HASH(0x24b4a1c)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24b48f0)', 'SVK::Path::Checkout=H
ASH(0x24ba110)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24b48f0)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
bfc00)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24bfc0
0)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 355
prompt mismatch (--- A/deep/mas (revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
-po
+wy
kra
czny
[1/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [S]> ) vs (--- A/deep/mas
(revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
-po
+wy
kra
czny
[1/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [S]> ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 6)\x{a}+++ A/deep/mas\x{9}(local)\x{a}
@@ -0,2 +0...', 'Regexp=SCALAR(0x246c9f4)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x24b3e
b8)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x246c9d
0)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x24
b411c)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24b48f0)', 'SVK::Path
::Checkout=HASH(0x24ba110)', 'HASH(0x24b4a1c)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24b48f0)', 'SVK::Path::Checkout=H
ASH(0x24ba110)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24b48f0)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
bfc00)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24bfc0
0)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 355
prompt mismatch (--- A/deep/mas (revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
-po
+wy
kra
czny
[1/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [A]> ) vs (--- A/deep/mas
(revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
-po
+wy
kra
czny
[1/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [A]> ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 6)\x{a}+++ A/deep/mas\x{9}(local)\x{a}
@@ -0,2 +0...', 'Regexp=SCALAR(0x24b4770)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x24b3e
b8)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x246c9d
0)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x24
b411c)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24b48f0)', 'SVK::Path
::Checkout=HASH(0x24ba110)', 'HASH(0x24b4a1c)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24b48f0)', 'SVK::Path::Checkout=H
ASH(0x24ba110)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24b48f0)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
bfc00)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24bfc0
0)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 355
prompt mismatch (--- A/deep/mas (revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
-po
+wy
kra
czny
[1/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [A]> ) vs (--- A/deep/mas
(revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
-po
+wy
kra
czny
[1/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [A]> ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 6)\x{a}+++ A/deep/mas\x{9}(local)\x{a}
@@ -0,2 +0...', 'Regexp=SCALAR(0x246c148)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x24b3e
b8)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x246c9d
0)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x24
b411c)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24b48f0)', 'SVK::Path
::Checkout=HASH(0x24ba110)', 'HASH(0x24b4a1c)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24b48f0)', 'SVK::Path::Checkout=H
ASH(0x24ba110)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24b48f0)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
bfc00)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24bfc0
0)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 355
prompt mismatch (--- A/deep/mas (revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
-po
+wy
kra
czny
[1/4] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties > ) vs (--- A/deep/mas (revisio
n 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
-po
+wy
kra
czny
[1/4] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 6)\x{a}+++ A/deep/mas\x{9}(local)\x{a}
@@ -0,2 +0...', 'Regexp=SCALAR(0x24ba5d8)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x24944
10)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x245143
c)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x24
6c5a4)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24742d4)', 'SVK::Path
::Checkout=HASH(0x246c34c)', 'HASH(0x24b4038)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24742d4)', 'SVK::Path::Checkout=H
ASH(0x246c34c)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24742d4)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
b9f9c)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24b9f9
c)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 485
prompt mismatch (--- A/deep/mas (revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
po
kra
-czny
\ No newline at end of file
+kal
[2/4] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties,
move to [p]revious change > ) vs (--- A/deep/mas (revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
po
kra
-czny
\ No newline at end of file
+kal
[2/4] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties,
move to [p]revious change > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 6)\x{a}+++ A/deep/mas\x{9}(local)\x{a}
@@ -0,2 +0...', 'Regexp=SCALAR(0x2451a90)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x24944
10)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x245143
c)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x24
6c5a4)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24742d4)', 'SVK::Path
::Checkout=HASH(0x246c34c)', 'HASH(0x24b4038)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24742d4)', 'SVK::Path::Checkout=H
ASH(0x246c34c)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24742d4)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
b9f9c)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24b9f9
c)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 485
prompt mismatch (--- A/deep/mas (revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
-po
+wy
kra
czny
[1/4] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [s]> ) vs (--- A/deep/mas
(revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
-po
+wy
kra
czny
[1/4] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [s]> ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 6)\x{a}+++ A/deep/mas\x{9}(local)\x{a}
@@ -0,2 +0...', 'Regexp=SCALAR(0x246d590)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x24944
10)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x245143
c)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x24
6c5a4)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24742d4)', 'SVK::Path
::Checkout=HASH(0x246c34c)', 'HASH(0x24b4038)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24742d4)', 'SVK::Path::Checkout=H
ASH(0x246c34c)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24742d4)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
b9f9c)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24b9f9
c)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 485
prompt mismatch (--- A/deep/mas (revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
po
kra
-czny
\ No newline at end of file
+kal
[2/4] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties,
move to [p]revious change > ) vs (--- A/deep/mas (revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
po
kra
-czny
\ No newline at end of file
+kal
[2/4] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties,
move to [p]revious change > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 6)\x{a}+++ A/deep/mas\x{9}(local)\x{a}
@@ -0,2 +0...', 'Regexp=SCALAR(0x24b441c)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x24944
10)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x245143
c)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x24
6c5a4)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24742d4)', 'SVK::Path
::Checkout=HASH(0x246c34c)', 'HASH(0x24b4038)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24742d4)', 'SVK::Path::Checkout=H
ASH(0x246c34c)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24742d4)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
b9f9c)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24b9f9
c)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 485
prompt mismatch (--- A/deep/mas (revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
-po
+wy
kra
czny
[1/4] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [s]> ) vs (--- A/deep/mas
(revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
-po
+wy
kra
czny
[1/4] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [s]> ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 6)\x{a}+++ A/deep/mas\x{9}(local)\x{a}
@@ -0,2 +0...', 'Regexp=SCALAR(0x2451544)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x24944
10)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x245143
c)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x24
6c5a4)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24742d4)', 'SVK::Path
::Checkout=HASH(0x246c34c)', 'HASH(0x24b4038)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24742d4)', 'SVK::Path::Checkout=H
ASH(0x246c34c)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24742d4)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
b9f9c)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24b9f9
c)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 485
prompt mismatch (--- A/deep/mas (revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
-po
+wy
kra
czny
[1/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [S]> ) vs (--- A/deep/mas
(revision 6)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
-po
+wy
kra
czny
[1/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [S]> ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 6)\x{a}+++ A/deep/mas\x{9}(local)\x{a}
@@ -0,2 +0...', 'Regexp=SCALAR(0x24b9b34)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x24944
10)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x245143
c)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x24
6c5a4)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24742d4)', 'SVK::Path
::Checkout=HASH(0x246c34c)', 'HASH(0x24b4038)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24742d4)', 'SVK::Path::Checkout=H
ASH(0x246c34c)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24742d4)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
b9f9c)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24b9f9
c)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 485
t\23commit-inter-nav.........ok 16/53prompt mismatch (--- A/deep/mas (revision 7)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
wy
-kra
+pstry
kal
[1/4] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties > ) vs (--- A/deep/mas (revisio
n 7)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
wy
-kra
+pstry
kal
[1/4] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 7)\x{a}+++ A/deep/mas\x{9}(local)\x{a}
@@ -0,2 +0...', 'Regexp=SCALAR(0x24b45e4)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x2451f
f4)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x246c79
0)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x23
654d8)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x23c2c80)', 'SVK::Path
::Checkout=HASH(0x24b47e8)', 'HASH(0x24951f0)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x23c2c80)', 'SVK::Path::Checkout=H
ASH(0x24b47e8)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x23c2c80)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
ba14c)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24ba14
c)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 582
prompt mismatch (--- A/deep/mas (revision 7)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
wy
-kra
+pstry
kal
[1/4] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [S]> ) vs (--- A/deep/mas
(revision 7)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
wy
-kra
+pstry
kal
[1/4] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [S]> ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 7)\x{a}+++ A/deep/mas\x{9}(local)\x{a}
@@ -0,2 +0...', 'Regexp=SCALAR(0x24b3dec)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x2451f
f4)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x246c79
0)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x23
654d8)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x23c2c80)', 'SVK::Path
::Checkout=HASH(0x24b47e8)', 'HASH(0x24951f0)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x23c2c80)', 'SVK::Path::Checkout=H
ASH(0x24b47e8)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x23c2c80)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
ba14c)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24ba14
c)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 582
prompt mismatch (--- A/foo (revision 7)
+++ A/foo (local)
@@ -0,1 +0,1 @@
-foobar
-grab
+temp
\ No newline at end of file
[2/2] Modification to 'A/foo' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
move to [p]revious change > ) vs (--- A/foo (revision 7)
+++ A/foo (local)
@@ -0,1 +0,1 @@
-foobar
-grab
+temp
\ No newline at end of file
[2/2] Modification to 'A/foo' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
move to [p]revious change > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/foo\x{9}(revision 7)\x{a}+++ A/foo\x{9}(local)\x{a}@@ -0,1 +0
,1 @@\x{a}-foo...', 'Regexp=SCALAR(0x24ba254)') called at SVK/Editor/InteractiveStatus.pm line 3
18
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x2451f
f4)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x246c79
0)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x23
654d8)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x23c2c80)', 'SVK::Path
::Checkout=HASH(0x24b47e8)', 'HASH(0x24951f0)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x23c2c80)', 'SVK::Path::Checkout=H
ASH(0x24b47e8)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x23c2c80)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
ba14c)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24ba14
c)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 582
prompt mismatch (--- A/deep/mas (revision 7)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
wy
-kra
+pstry
kal
[1/2] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [c]> ) vs (--- A/deep/mas
(revision 7)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
wy
-kra
+pstry
kal
[1/2] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [c]> ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 7)\x{a}+++ A/deep/mas\x{9}(local)\x{a}
@@ -0,2 +0...', 'Regexp=SCALAR(0x24b9f9c)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x2451f
f4)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x246c79
0)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x23
654d8)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x23c2c80)', 'SVK::Path
::Checkout=HASH(0x24b47e8)', 'HASH(0x24951f0)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x23c2c80)', 'SVK::Path::Checkout=H
ASH(0x24b47e8)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x23c2c80)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
ba14c)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24ba14
c)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 582
prompt mismatch (--- A/deep/mas (revision 7)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
wy
-kra
+pstry
kal
[1/2] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [a]> ) vs (--- A/deep/mas
(revision 7)
+++ A/deep/mas (local)
@@ -0,2 +0,2 @@
wy
-kra
+pstry
kal
[1/2] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties [a]> ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 7)\x{a}+++ A/deep/mas\x{9}(local)\x{a}
@@ -0,2 +0...', 'Regexp=SCALAR(0x24b9cf0)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x2451f
f4)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x246c79
0)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x23
654d8)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x23c2c80)', 'SVK::Path
::Checkout=HASH(0x24b47e8)', 'HASH(0x24951f0)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x23c2c80)', 'SVK::Path::Checkout=H
ASH(0x24b47e8)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x23c2c80)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
ba14c)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24ba14
c)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 582
prompt mismatch (--- A/foo (revision 7)
+++ A/foo (local)
@@ -0,1 +0,1 @@
-foobar
-grab
+temp
\ No newline at end of file
[2/2] Modification to 'A/foo' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
move to [p]revious change > ) vs (--- A/foo (revision 7)
+++ A/foo (local)
@@ -0,1 +0,1 @@
-foobar
-grab
+temp
\ No newline at end of file
[2/2] Modification to 'A/foo' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
move to [p]revious change > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/foo\x{9}(revision 7)\x{a}+++ A/foo\x{9}(local)\x{a}@@ -0,1 +0
,1 @@\x{a}-foo...', 'Regexp=SCALAR(0x24944d0)') called at SVK/Editor/InteractiveStatus.pm line 3
18
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x2451f
f4)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x246c79
0)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x23
654d8)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x23c2c80)', 'SVK::Path
::Checkout=HASH(0x24b47e8)', 'HASH(0x24951f0)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x23c2c80)', 'SVK::Path::Checkout=H
ASH(0x24b47e8)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x23c2c80)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
ba14c)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24ba14
c)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 582
prompt mismatch (--- foo (revision 9)
+++ foo (local)
@@ -0,1 +0,1 @@
-foobar
+za
grab
[1/2] Modification to 'foo' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file > ) vs (--- foo (revision 9)
+++ foo (local)
@@ -0,1 +0,1 @@
-foobar
+za
grab
[1/2] Modification to 'foo' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- foo\x{9}(revision 9)\x{a}+++ foo\x{9}(local)\x{a}@@ -0,1 +0,1 @
@\x{a}-foobar\x{d}...', 'Regexp=SCALAR(0x24b9b28)') called at SVK/Editor/InteractiveStatus.pm li
ne 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x24ba3
38)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x24950d
c)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x24
6c778)', 'path', '/A', 'targets', 'ARRAY(0x24b9dbc)', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)
', ...) called at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24b4578)', 'SVK::Path
::Checkout=HASH(0x24ba968)', 'HASH(0x24c00e0)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24b4578)', 'SVK::Path::Checkout=H
ASH(0x24ba968)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24b4578)', 'A/foo') called at App
/CLI.pm line 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x23
593f4)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x23593f
4)', '--interactive', 'A/foo', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', 'A/foo', '-m', 'foo') called at SV
K/Test.pm line 341
SVK::Test::_do_run('SVK=HASH(0x1807b08)', 'commit', 'ARRAY(0x24b3d20)') called at SVK/Te
st.pm line 346
SVK::Test::is_output('SVK=HASH(0x1807b08)', 'commit', 'ARRAY(0x24b3d20)', 'ARRAY(0x24ba1
ac)', 'Skip everything in interactive commit.') called at t\23commit-inter-nav.t line 641
prompt mismatch (--- foo (revision 9)
+++ foo (local)
@@ -0,1 +0,1 @@
foobar
grab
+ione
[2/2] Modification to 'foo' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
move to [p]revious change > ) vs (--- foo (revision 9)
+++ foo (local)
@@ -0,1 +0,1 @@
foobar
grab
+ione
[2/2] Modification to 'foo' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
move to [p]revious change > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- foo\x{9}(revision 9)\x{a}+++ foo\x{9}(local)\x{a}@@ -0,1 +0,1 @
@\x{a} foobar\x{d}...', 'Regexp=SCALAR(0x246c934)') called at SVK/Editor/InteractiveStatus.pm li
ne 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x24ba3
38)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x24950d
c)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x24
6c778)', 'path', '/A', 'targets', 'ARRAY(0x24b9dbc)', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)
', ...) called at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24b4578)', 'SVK::Path
::Checkout=HASH(0x24ba968)', 'HASH(0x24c00e0)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24b4578)', 'SVK::Path::Checkout=H
ASH(0x24ba968)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24b4578)', 'A/foo') called at App
/CLI.pm line 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x23
593f4)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x23593f
4)', '--interactive', 'A/foo', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', 'A/foo', '-m', 'foo') called at SV
K/Test.pm line 341
SVK::Test::_do_run('SVK=HASH(0x1807b08)', 'commit', 'ARRAY(0x24b3d20)') called at SVK/Te
st.pm line 346
SVK::Test::is_output('SVK=HASH(0x1807b08)', 'commit', 'ARRAY(0x24b3d20)', 'ARRAY(0x24ba1
ac)', 'Skip everything in interactive commit.') called at t\23commit-inter-nav.t line 641
prompt mismatch (--- foo (revision 9)
+++ foo (local)
@@ -0,1 +0,1 @@
-foobar
+za
grab
[1/3] Modification to 'foo' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties > ) vs (--- foo (revisio
n 9)
+++ foo (local)
@@ -0,1 +0,1 @@
-foobar
+za
grab
[1/3] Modification to 'foo' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- foo\x{9}(revision 9)\x{a}+++ foo\x{9}(local)\x{a}@@ -0,1 +0,1 @
@\x{a}-foobar\x{d}...', 'Regexp=SCALAR(0x24ba9c8)') called at SVK/Editor/InteractiveStatus.pm li
ne 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x24513
1c)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x24b3d5
c)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x24
b450c)', 'path', '/A', 'targets', 'ARRAY(0x24952a4)', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)
', ...) called at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24c053c)', 'SVK::Path
::Checkout=HASH(0x24b43f8)', 'HASH(0x246c814)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24c053c)', 'SVK::Path::Checkout=H
ASH(0x24b43f8)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24c053c)', 'A/foo') called at App
/CLI.pm line 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
b4704)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24b470
4)', '--interactive', 'A/foo', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', 'A/foo', '-m', 'foo') called at t\
23commit-inter-nav.t line 669
prompt mismatch (--- foo (revision 9)
+++ foo (local)
@@ -0,1 +0,1 @@
-foobar
+za
grab
[1/3] Modification to 'foo' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties > ) vs (--- foo (revisio
n 9)
+++ foo (local)
@@ -0,1 +0,1 @@
-foobar
+za
grab
[1/3] Modification to 'foo' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
a[c]cept, s[k]ip rest of changes to this file and its properties > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- foo\x{9}(revision 9)\x{a}+++ foo\x{9}(local)\x{a}@@ -0,1 +0,1 @
@\x{a}-foobar\x{d}...', 'Regexp=SCALAR(0x24e10d0)') called at SVK/Editor/InteractiveStatus.pm li
ne 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x24ba4
40)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x24b9f6
c)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x24
6c610)', 'path', '/A', 'targets', 'ARRAY(0x24ba110)', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)
', ...) called at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24c0578)', 'SVK::Path
::Checkout=HASH(0x24bfda4)', 'HASH(0x24ba0bc)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24c0578)', 'SVK::Path::Checkout=H
ASH(0x24bfda4)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24c0578)', 'A/foo') called at App
/CLI.pm line 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
b450c)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24b450
c)', '--interactive', 'A/foo', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', 'A/foo', '-m', 'foo') called at t\
23commit-inter-nav.t line 707
t\23commit-inter-nav.........ok 32/53prompt mismatch (--- A/foo (revision 11)
+++ A/foo (local)
@@ -0,2 +0,2 @@
za
-grab
-ione
+palny
[1/1] Modification to 'A/foo' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file > ) vs (--- A/foo (revision 11)
+++ A/foo (local)
@@ -0,2 +0,2 @@
za
-grab
-ione
+palny
[1/1] Modification to 'A/foo' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/foo\x{9}(revision 11)\x{a}+++ A/foo\x{9}(local)\x{a}@@ -0,2 +
0,2 @@\x{a} za...', 'Regexp=SCALAR(0x269806c)') called at SVK/Editor/InteractiveStatus.pm line 3
18
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x26983
0c)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x24b481
8)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x25
f3814)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24ba824)', 'SVK::Path
::Checkout=HASH(0x24bfeac)', 'HASH(0x2634fd0)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24ba824)', 'SVK::Path::Checkout=H
ASH(0x24bfeac)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24ba824)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x1c
9b988)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x1c9b98
8)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 764
prompt mismatch (--- A/foo (revision 12)
+++ A/foo (local)
@@ -0,1 +0 @@
-za
-palny
[1/1] Modification to 'A/foo' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file > ) vs (--- A/foo (revision 12)
+++ A/foo (local)
@@ -0,1 +0 @@
-za
-palny
[1/1] Modification to 'A/foo' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/foo\x{9}(revision 12)\x{a}+++ A/foo\x{9}(local)\x{a}@@ -0,1 +
0 @@\x{a}-za\x{d}\x{a}...', 'Regexp=SCALAR(0x261b6b8)') called at SVK/Editor/InteractiveStatus.p
m line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x2654e
fc)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x2698c0
0)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x26
54290)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x25f34a8)', 'SVK::Path
::Checkout=HASH(0x261b9b8)', 'HASH(0x26154dc)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x25f34a8)', 'SVK::Path::Checkout=H
ASH(0x261b9b8)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x25f34a8)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x24
b9abc)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x24b9ab
c)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 807
t\23commit-inter-nav.........ok 47/53prompt mismatch (--- A/deep/mas (revision 15)
+++ A/deep/mas (local)
@@ -0,1 +0,1 @@
+byk
krowa
koza
[1/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file > ) vs (--- A/deep/mas (revision 15)
+++ A/deep/mas (local)
@@ -0,1 +0,1 @@
+byk
krowa
koza
[1/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 15)\x{a}+++ A/deep/mas\x{9}(local)\x{a
}@@ -0,1 +...', 'Regexp=SCALAR(0x2655130)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x26985
f4)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x2654e4
8)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x26
155d8)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24baa64)', 'SVK::Path
::Checkout=HASH(0x2617b88)', 'HASH(0x261b82c)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24baa64)', 'SVK::Path::Checkout=H
ASH(0x2617b88)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24baa64)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x26
98a8c)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x2698a8
c)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 882
prompt mismatch (--- A/deep/mas (revision 15)
+++ A/deep/mas (local)
@@ -0,1 +1,1 @@
krowa
+bawol
koza
[2/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
move to [p]revious change > ) vs (--- A/deep/mas (revision 15)
+++ A/deep/mas (local)
@@ -0,1 +1,1 @@
krowa
+bawol
koza
[2/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
move to [p]revious change > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 15)\x{a}+++ A/deep/mas\x{9}(local)\x{a
}@@ -0,1 +...', 'Regexp=SCALAR(0x261b820)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x26985
f4)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x2654e4
8)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x26
155d8)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24baa64)', 'SVK::Path
::Checkout=HASH(0x2617b88)', 'HASH(0x261b82c)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24baa64)', 'SVK::Path::Checkout=H
ASH(0x2617b88)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24baa64)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x26
98a8c)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x2698a8
c)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 882
prompt mismatch (--- A/deep/mas (revision 15)
+++ A/deep/mas (local)
@@ -0,1 +2,1 @@
krowa
koza
+kaczka
[3/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
move to [p]revious change > ) vs (--- A/deep/mas (revision 15)
+++ A/deep/mas (local)
@@ -0,1 +2,1 @@
krowa
koza
+kaczka
[3/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
move to [p]revious change > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 15)\x{a}+++ A/deep/mas\x{9}(local)\x{a
}@@ -0,1 +...', 'Regexp=SCALAR(0x26982c4)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x26985
f4)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x2654e4
8)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x26
155d8)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x24baa64)', 'SVK::Path
::Checkout=HASH(0x2617b88)', 'HASH(0x261b82c)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x24baa64)', 'SVK::Path::Checkout=H
ASH(0x2617b88)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x24baa64)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x26
98a8c)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x2698a8
c)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 882
prompt mismatch (--- A/deep/mas (revision 16)
+++ A/deep/mas (local)
@@ -0,4 +0,4 @@
-byk
+mleczna
krowa
bawol
koza
kaczka
[1/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file > ) vs (--- A/deep/mas (revision 16)
+++ A/deep/mas (local)
@@ -0,4 +0,4 @@
-byk
+mleczna
krowa
bawol
koza
kaczka
[1/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 16)\x{a}+++ A/deep/mas\x{9}(local)\x{a
}@@ -0,4 +...', 'Regexp=SCALAR(0x25f334c)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x25f35
5c)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x24e0fc
8)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x25
f3af0)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x269d9a4)', 'SVK::Path
::Checkout=HASH(0x2698ac8)', 'HASH(0x2655154)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x269d9a4)', 'SVK::Path::Checkout=H
ASH(0x2698ac8)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x269d9a4)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x25
f35b0)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x25f35b
0)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 942
prompt mismatch (--- A/deep/mas (revision 16)
+++ A/deep/mas (local)
@@ -0,4 +0,4 @@
-byk
+mleczna
krowa
bawol
koza
kaczka
[1/2] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file [A]> ) vs (--- A/deep/mas (revision 16)
+++ A/deep/mas (local)
@@ -0,4 +0,4 @@
-byk
+mleczna
krowa
bawol
koza
kaczka
[1/2] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file [A]> ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 16)\x{a}+++ A/deep/mas\x{9}(local)\x{a
}@@ -0,4 +...', 'Regexp=SCALAR(0x2698924)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x25f35
5c)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x24e0fc
8)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x25
f3af0)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x269d9a4)', 'SVK::Path
::Checkout=HASH(0x2698ac8)', 'HASH(0x2655154)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x269d9a4)', 'SVK::Path::Checkout=H
ASH(0x2698ac8)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x269d9a4)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x25
f35b0)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x25f35b
0)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 942
prompt mismatch (--- A/deep/mas (revision 16)
+++ A/deep/mas (local)
@@ -0,4 +0,3 @@
byk
krowa
-bawol
-koza
-kaczka
[2/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
move to [p]revious change > ) vs (--- A/deep/mas (revision 16)
+++ A/deep/mas (local)
@@ -0,4 +0,3 @@
byk
krowa
-bawol
-koza
-kaczka
[2/3] Modification to 'A/deep/mas' file:
[a]ccept, [s]kip this change,
[A]ccept, [S]kip the rest of changes to this file,
move to [p]revious change > ) at SVK/Test.pm line 129
SVK::Test::__ANON__('--- A/deep/mas\x{9}(revision 16)\x{a}+++ A/deep/mas\x{9}(local)\x{a
}@@ -0,4 +...', 'Regexp=SCALAR(0x269d530)') called at SVK/Editor/InteractiveStatus.pm line 318
SVK::Editor::InteractiveStatus::UI::run('SVK::Editor::InteractiveStatus::UI=HASH(0x25f35
5c)') called at SVK/Editor/InteractiveStatus.pm line 120
SVK::Editor::InteractiveStatus::close_edit('SVK::Editor::InteractiveStatus=HASH(0x24e0fc
8)') called at SVK/XD.pm line 1527
SVK::XD::checkout_delta('SVK::XD=HASH(0x18079ac)', 'copath', 'Path::Class::Dir=HASH(0x25
f3af0)', 'path', '/', 'targets', 'undef', 'repos', '_p_svn_repos_t=SCALAR(0x1867350)', ...) call
ed at SVK/Command/Commit.pm line 386
SVK::Command::Commit::get_committable('SVK::Command::Commit=HASH(0x269d9a4)', 'SVK::Path
::Checkout=HASH(0x2698ac8)', 'HASH(0x2655154)') called at SVK/Command/Commit.pm line 579
SVK::Command::Commit::run('SVK::Command::Commit=HASH(0x269d9a4)', 'SVK::Path::Checkout=H
ASH(0x2698ac8)') called at SVK/Command.pm line 221
eval {...} called at SVK/Command.pm line 219
eval {...} called at SVK/Command.pm line 199
SVK::Command::run_command('SVK::Command::Commit=HASH(0x269d9a4)') called at App/CLI.pm l
ine 79
App::CLI::dispatch('SVK::Command', 'xd', 'SVK::XD=HASH(0x18079ac)', 'output', 'GLOB(0x25
f35b0)') called at SVK/Command.pm line 163
eval {...} called at SVK/Command.pm line 163
SVK::Command::invoke('SVK::Command', 'SVK::XD=HASH(0x18079ac)', 'commit', 'GLOB(0x25f35b
0)', '--interactive', '-m', 'foo') called at SVK.pm line 101
eval {...} called at SVK.pm line 101
SVK::__ANON__('SVK=HASH(0x1807b08)', '--interactive', '-m', 'foo') called at t\23commit-
inter-nav.t line 942
t\23commit-inter-nav.........ok
t\23commit-inter-output......ok
t\23commit-mirror............ok
t\23commit-multi.............ok
t\23commit-subdir............ok
t\23commit...................ok
t\24diff.....................ok
t\25log-filter...............ok
t\25log-xml..................ok
t\25log......................ok
t\26revert-remove............ok
t\26revert...................ok
t\27mkdir....................ok
t\28info.....................ok
t\29update-mix...............ok
t\30annotate.................ok
t\31cat......................ok
t\32list.....................ok
t\33prop.....................ok
t\34revprop..................ok
t\35admin....................ok
t\36push-pull-cross..........ok 2/3# uncleaned txns (8) on //
t\36push-pull-cross..........ok
t\36push-pull-local..........ok
t\36push-pull................ok 15/15# uncleaned txns (4) on //
t\36push-pull................ok
t\37revspec..................ok
t\38stall-schedule...........ok
t\50dav......................skipped
all skipped: Test does not run under root
t\60patchset.................skipped
all skipped: Text::Thread required for testing patchset
t\70symlink..................ok
8/54 skipped: various reasons
t\71autovivify...............ok 4/14Use of uninitialized value in join or string at (eval 100) l
ine 2.
Use of uninitialized value in join or string at (eval 100) line 2.
Use of uninitialized value in join or string at (eval 100) line 2.
Use of uninitialized value in join or string at (eval 100) line 2.
Use of uninitialized value in join or string at (eval 100) line 2.
Use of uninitialized value in join or string at (eval 100) line 2.
t\71autovivify...............ok
t\72sign.....................'gpg' is not recognized as an internal or external command,
operable program or batch file.
skipped
all skipped: gnupg not found
t\73i18n.....................skipped
all skipped: cannot set locale to zh_TW.Big5
t\74chgspec..................ok
t\74view-mirror..............ok
t\74view.....................ok
t\75hook.....................ok
t\76ignore...................ok
t\77floating.................ok
t\copy-escape................ok
t\copy-replace...............ok
Failed Test Stat Wstat Total Fail List of Failed
-------------------------------------------------------------------------------
t\03import-nomime.t 1 256 2 1 2
t\20add-nomime.t 1 256 2 1 2
t\20add.t 1 256 35 1 34
(1 subtest UNEXPECTEDLY SUCCEEDED), 9 tests and 32 subtests skipped.
Failed 3/103 test scripts. 3/1507 subtests failed.
Files=103, Tests=1507, 509 wallclock secs ( 0.00 cusr + 0.00 csys = 0.00 CPU)
Failed 3/103 test programs. 3/1507 subtests failed.
More information about the svk-devel
mailing list