[fossil-users] fossil.exe: lack both primary and secondary files

2012-04-14 Thread Petr Ferdus
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. Previo

Re: [fossil-users] fossil.exe: lack both primary and secondary files

2012-04-14 Thread Richard Hipp
On Sat, Apr 14, 2012 at 3:27 AM, Petr Ferdus 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 mes

Re: [fossil-users] fossil.exe: lack both primary and secondary files

2012-04-14 Thread Matt Welland
On Sat, Apr 14, 2012 at 11:35 AM, Richard Hipp wrote: > > > On Sat, Apr 14, 2012 at 3:27 AM, Petr Ferdus 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

Re: [fossil-users] fossil.exe: lack both primary and secondary files

2012-04-14 Thread Petr Ferdus
_ > Od: "Matt Welland" > Komu: "Fossil SCM user's discussion" > Datum: 14.04.2012 22:41 > Předmět: Re: [fossil-users] fossil.exe: lack both primary and secondary files > >On Sat, Ap

Re: [fossil-users] fossil.exe: lack both primary and secondary files

2012-04-14 Thread Gour
On Sun, 15 Apr 2012 07:57:04 +0200 "Petr Ferdus" wrote: > At moment I have no means how to put them online. If you're allowed, then email repo to the Richard helping him to troubleshoot. Sincerely, Gour -- There is no work that affects Me; nor do I aspire for the fruits of action. One who u

Re: [fossil-users] fossil.exe: lack both primary and secondary files

2012-04-15 Thread Lluís Batlle i Rossell
On Sun, Apr 15, 2012 at 07:57:04AM +0200, Petr Ferdus wrote: > _ > > Od: "Matt Welland" > >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

Re: [fossil-users] fossil.exe: lack both primary and secondary files

2012-04-15 Thread Petr Ferdus
__ > Od: "Lluís Batlle i Rossell" > Komu: "Fossil SCM user's discussion" > Datum: 15.04.2012 10:53 > Předmět: Re: [fossil-users] fossil.exe: lack both primary and secondary files > >On Sun, Ap