Re: Merging locationmap with trunk [was: Merging views with trunk]

2005-07-04 Thread Ross Gardler
Thorsten Scherler wrote: On Fri, 2005-07-01 at 08:33 +0100, Ross Gardler wrote: Tim Williams wrote: The actual merge is going to be complex though. Why? I will happily merge the stuff. Actually not too much have changed. Because it will not be a simple merge this branch with the

Re: Merging locationmap with trunk [was: Merging views with trunk]

2005-07-04 Thread Thorsten Scherler
On Mon, 2005-07-04 at 11:52 +0100, Ross Gardler wrote: Thorsten Scherler wrote: On Fri, 2005-07-01 at 08:33 +0100, Ross Gardler wrote: Tim Williams wrote: The actual merge is going to be complex though. Why? I will happily merge the stuff. Actually not too much have

Re: Merging locationmap with trunk [was: Merging views with trunk]

2005-07-01 Thread Ross Gardler
Tim Williams wrote: Now to the road-map I see for views and the lm-branch: 1) Fix all issues with the lm in the lm-branch (there are just minor ones that I am aware of) 2) merge all lm related stuff with trunk (branch-trunk) 3) merge all view changes into whiteboard trunk (branch-trunk) That

Re: Merging locationmap with trunk [was: Merging views with trunk]

2005-07-01 Thread Thorsten Scherler
On Fri, 2005-07-01 at 08:33 +0100, Ross Gardler wrote: Tim Williams wrote: Now to the road-map I see for views and the lm-branch: 1) Fix all issues with the lm in the lm-branch (there are just minor ones that I am aware of) 2) merge all lm related stuff with trunk (branch-trunk) 3) merge all

Merging locationmap with trunk [was: Merging views with trunk]

2005-06-30 Thread Tim Williams
Now to the road-map I see for views and the lm-branch: 1) Fix all issues with the lm in the lm-branch (there are just minor ones that I am aware of) 2) merge all lm related stuff with trunk (branch-trunk) 3) merge all view changes into whiteboard trunk (branch-trunk) That step is and should