Skip Menu |
 

This queue is for tickets about the svk CPAN distribution.

Report information
The Basics
Id: 33176
Status: open
Priority: 0/
Queue: svk

People
Owner: Nobody in particular
Requestors: adrian.wilkins [...] gmail.com
Cc:
AdminCc:

Bug Information
Severity: Critical
Broken in: v2.0.2
Fixed in: (no value)



Download (untitled) / with headers
text/plain 675b
SVK 2.0.2 win32. svk pull /project/local or svk smerge /project/mirror /project/local /project/mirror has deleted file.txt /project/local has not edited file.txt Merge fails : Filesystem has no item: File not found: transaction '326-1', path '/local/file.txt' Transaction does not complete, thus NO changes from this revision onwards can be merged. Merge needs to catch this condition and deal with it gracefully, just like other conflicts. Error message is also misleading ; the reported path does exist. There are spaces in the source and target paths for the file concerned. There are no SVK working copies of these files ; SVK is being used to mirror an SVN repo.
From: RUZ [...] cpan.org
Tested several cases: 1) rm+smerge when local is a fresh copy 2) similar to above case, but file name has a space 3) tested as well when base for the merge is the local branch I couldn't reproduce this issue. Can you please show us full output, you can replace paths if you like, but you should leave them consistent. On Tue Feb 12 08:23:54 2008, awilkins wrote: Show quoted text
> SVK 2.0.2 win32. > > svk pull /project/local > or > svk smerge /project/mirror /project/local > > /project/mirror has deleted file.txt > /project/local has not edited file.txt > > Merge fails : > > Filesystem has no item: File not found: transaction '326-1', path > '/local/file.txt' > > Transaction does not complete, thus NO changes from this revision > onwards can be merged. Merge needs to catch this condition and deal with > it gracefully, just like other conflicts. > > Error message is also misleading ; the reported path does exist. > > There are spaces in the source and target paths for the file concerned. > There are no SVK working copies of these files ; SVK is being used to > mirror an SVN repo.
-- Best regards, Ruslan.


This service is sponsored and maintained by Best Practical Solutions and runs on Perl.org infrastructure.

Please report any issues with rt.cpan.org to rt-cpan-admin@bestpractical.com.