Suddenly it seems to work. I looked at a merge on the common ancestor then gradually worked forward in time and found merge to be working on the most recent version, which previously produced the error I mentioned. Very odd, but happy I can make progress, though still a little mystified...

2010/1/7 Lukas Renggli <renggli@gmail.com>
That version is in http://source.lukas-renggli.ch/magritte and is
needed to merge because it is a common ancestor of the two version you
are merging. Are you sure that Magritte-Model has
http://source.lukas-renggli.ch/magritte as a repository added?

Lukas

2010/1/7 Nick Ager <nick.ager@gmail.com>:
> Any ideas on why I get the following error message when I press merge from
> the original pier repository: 'Could not find version
> ''Magritte-Model-lr.358''. Maybe you need to add a repository?'
> However the changes button works as I'd expect.
> 2010/1/6 Nick Ager <nick.ager@gmail.com>
>>
>> I've created a fresh seaside3.0a5 image, loaded Magritte and Pier into it
>> and I've failed at the first merge hurdle. I'm starting with Magritte-Model
>> and when I try merging from 'http://source.lukas-renggli.ch/magritte' I get
>> the error:
>> 'Could not find version ''Magritte-Model-lr.358''. Maybe you need to add a
>> repository?'
>>
>> any thoughts on my beginners error?
>> Thanks Nick
>> 2010/1/6 Lukas Renggli <renggli@gmail.com>
>>>
>>> > I'm happy to have a go bringing the Pier 3.0 repository upto the latest
>>> > 2.8
>>> > codebase, but I'll need support. For example I'm not sure how to diff
>>> > code
>>> > from two different repositories in Pharo..., plus my knowledge of Pier
>>> > is
>>> > still rudimentary - but I guess I've got to start somewhere... Would it
>>> > be a
>>> > horrendous undertaking??
>>>
>>> The process is simple: You load the latest Magritte/Pier 3.0 code into
>>> your image, then you add the old Magritte and Pier repositories using
>>> the "+Repository" button, open the repository browser on that
>>> repository, select the latest version of each package (e.g.
>>> Magritte-Core) and click on "Merge".
>>>
>>> Normally merging should be really easy, but I don't know how much
>>> Magritte and Pier changed from the previous version. Also the merging
>>> does not work if the packages got renamed.
>>>
>>> Lukas
>>>
>>> --
>>> Lukas Renggli
>>> http://www.lukas-renggli.ch
>>>
>>> _______________________________________________
>>> Magritte, Pier and Related Tools ...
>>> https://www.iam.unibe.ch/mailman/listinfo/smallwiki
>>
>
>
> _______________________________________________
> Magritte, Pier and Related Tools ...
> https://www.iam.unibe.ch/mailman/listinfo/smallwiki
>



--
Lukas Renggli
http://www.lukas-renggli.ch

_______________________________________________
Magritte, Pier and Related Tools ...
https://www.iam.unibe.ch/mailman/listinfo/smallwiki