On Sat, Apr 14, 2012 at 11:35 AM, Richard Hipp <d...@sqlite.org> wrote:
> > > On Sat, Apr 14, 2012 at 3:27 AM, Petr Ferdus <petr...@centrum.cz> wrote: > >> >> Hello, >> >> I am trying to merge my local fossil repo with trunk and all I receive is >> message "fossil.exe: lack both primary and secondary files". >> I thought it might be related to use of my patched version of fossil.exe >> but the same message appears with latest windows binary from fossil site. >> Previously, I have merged my local fossil repo literally hundred’s times >> so I am quite confused what might went wrong. >> > > I don't understand this either. The error is more of an assertion than > something that a user ought to see - it is not suppose to ever occur and it > indicates that something is wrong with the merge logic. As far as I know, > it has never come up before. > > If you can figure out how to reproduce the problem, that would be a big > help. > I've seen this when merging from a more recent check in to an older check in. Checking out the newer version and merging the old version into it seemed to fix it. > Rebuilding repo does not help. >> I know the message comes from pivot.c [ >> http://www.fossil-scm.org/fossil/artifact/01042d5f6?ln=87] >> as used in merge.c [ >> http://www.fossil-scm.org/fossil/artifact/0735646a51a?ln=167] >> Last time I pulled artifact from fossil canonical server I received a >> message *** time skew *** server is slow by 32.3 seconds. >> Could this lead to perceived problem? >> What else should I try to solve problem with merge? >> >> Thanks. >> >> Peter >> >> >> c:\soft\msys\home\user\fossil>fossil ver >> This is fossil version 1.22 [5dd5d39e7c] 2012-03-19 12:45:47 UTC >> >> c:\soft\msys\home\user\fossil>fossil rebu c:\soft\bin\myfossilclone.fossil >> 100.0% complete... >> >> c:\soft\msys\home\user\fossil>fossil merge trunk >> c:\soft\msys\home\user\fossil\fossil.exe: lack both primary and secondary >> files >> >> c:\soft\msys\home\user\fossil>fossil merge --debug trunk >> c:\soft\msys\home\user\fossil\fossil.exe: lack both primary and secondary >> files >> _______________________________________________ >> fossil-users mailing list >> fossil-users@lists.fossil-scm.org >> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users >> > > > > -- > D. Richard Hipp > d...@sqlite.org > > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > >
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
