[svk-devel] Checksum mismatch?
Adrian Howard
adrianh at quietstars.com
Wed Apr 11 05:49:20 EDT 2007
I'm getting this error on a push - anonymised output at end of
message. A google around hasn't helped me much. Any pointers?
Cheers,
Adrian
% svk push --verbatim
Auto-merging (1337, 1339) /local/projects/someproject/trunk to /
mirror/projects/someproject/trunk (base /mirror/projects/someproject/
trunk:1325).
===> Auto-merging (1337, 1338) /local/projects/someproject/trunk to /
mirror/projects/someproject/trunk (base /mirror/projects/someproject/
trunk:1325).
Merging back to mirror source svn+ssh://adrian@example.com/var/svn.
g sql/07-schema.sql
g t/spaces.t
g t/iwa/dispatch.t
g t/developer/spelling.t
g t/space-plugin.t
g t/edit-a-space.t
g t/my-spaces.t
g t/member.t
g + doc/release-1.0.txt
Conflict found in doc/release-plan.txt:
e)dit, d)iff, m)erge, s)kip, t)heirs, y)ours, h)elp? [e] y
G doc/release-plan.txt
g lib/IWA/StaticPage.pm
g lib/IWA/Dispatch.pm
g lib/UMS/Member.pm
g lib/UMS/MySpacesPage.pm
g lib/UMS/SendToAFriendPage.pm
g lib/UMS/Plugin/Space.pm
g lib/UMS/Space.pm
g lib/UMS/SendMessagePage.pm
g lib/UMS/EditASpacePage.pm
g lib/UMS/Dispatch.pm
g lib/UMS/AddASpacePage.pm
g Build.PL
g templates/pages/my_spaces.tt2
g templates/pages/home.tt2
g templates/pages/send_message.tt2
g templates/pages/edit_a_space.tt2
g templates/pages/add_a_space.tt2
g templates/pages/search.tt2
g templates/pages/send_message_thanks.tt2
g templates/components/select_hour.tt2
g templates/components/select_day.tt2
g templates/components/box_search.tt2
g templates/components/most_recent.tt2
g templates/components/my_spaces.tt2
g templates/components/select_month.tt2
g templates/components/nav_main.tt2
g templates/components/select_year.tt2
g templates/components/select_minute.tt2
New merge ticket: 64cdce17-df27-0410-b9ed-b501ccb57d24:/local/
projects/someproject/trunk:1338
A checksum mismatch occurred: Checksum mismatch for resulting fulltext
(/projects/someproject/trunk/doc/release-1.0.txt):
expected checksum: 983d119bfac60e4e5620859838a6f5cf
actual checksum: 824880b04a99acf1058273a069b3d11c
More information about the svk-devel
mailing list