Hi all,
I have a clone of the ODK Collect (rc1) and with the release of rc2 I
wondered if there is a way to merge in the RC2 code changes into my
cloned version? I realise there could be some conflicts which I'd need
to resolve.
I had a look in the team options in Eclipse and also in the setting
page of my clone on Google code (https://code.google.com/r/alextlittle-
dc-odk/) - but I couldn't see any information that helped me figure
this out.
I've actually made relatively minor changes in our code, so if the
answer is the I just need to create a new clone and apply my changes
then thats ok - but would be nice if there's a way to keep my clone up
to date with the changes in the core.
Any help much appreciated!
Thanks,
Alex
alex,
do an 'hg pull http://code.google.com/p/opendatakit.collect/' and then
merge the changes. if you didn't know about hg pull, you should read
http://hginit.com.
also, please send dev questions over to
opendatakit-developers@googlegroups.com. as the community grows, we
don't want to scare the normal people away with code emails 
yaw
···
On Wed, Oct 5, 2011 at 22:22, Alex Little wrote:
> Hi all,
>
> I have a clone of the ODK Collect (rc1) and with the release of rc2 I
> wondered if there is a way to merge in the RC2 code changes into my
> cloned version? I realise there could be some conflicts which I'd need
> to resolve.
>
> I had a look in the team options in Eclipse and also in the setting
> page of my clone on Google code (https://code.google.com/r/alextlittle-
> dc-odk/) - but I couldn't see any information that helped me figure
> this out.
>
> I've actually made relatively minor changes in our code, so if the
> answer is the I just need to create a new clone and apply my changes
> then thats ok - but would be nice if there's a way to keep my clone up
> to date with the changes in the core.
>
> Any help much appreciated!
> Thanks,
> Alex
>
> --
> Post: opendatakit@googlegroups.com
> Unsubscribe: opendatakit+unsubscribe@googlegroups.com
> Options: http://groups.google.com/group/opendatakit?hl=en
>
Hi Alex
I also maintain a parallel fork of the Collect codebase. I basically made a
local clone of the collect code. I make my own changes to that code. I
occasionally pull the latest code from the server and resolve any conflicts
that occur manually. It's generally quite an easy process.
Adi
···
On Oct 6, 2011 7:22 AM, "Alex Little" wrote:
> Hi all,
>
> I have a clone of the ODK Collect (rc1) and with the release of rc2 I
> wondered if there is a way to merge in the RC2 code changes into my
> cloned version? I realise there could be some conflicts which I'd need
> to resolve.
>
> I had a look in the team options in Eclipse and also in the setting
> page of my clone on Google code (https://code.google.com/r/alextlittle-
> dc-odk/) - but I couldn't see any information that helped me figure
> this out.
>
> I've actually made relatively minor changes in our code, so if the
> answer is the I just need to create a new clone and apply my changes
> then thats ok - but would be nice if there's a way to keep my clone up
> to date with the changes in the core.
>
> Any help much appreciated!
> Thanks,
> Alex
>
> --
> Post: opendatakit@googlegroups.com
> Unsubscribe: opendatakit+unsubscribe@googlegroups.com
> Options: http://groups.google.com/group/opendatakit?hl=en
Great - thanks - the hg pull did exactly what I needed
Cheers,
Alex
···
On Oct 6, 7:43 am, Adi Eyal wrote:
> Hi Alex
>
> I also maintain a parallel fork of the Collect codebase. I basically made a
> local clone of the collect code. I make my own changes to that code. I
> occasionally pull the latest code from the server and resolve any conflicts
> that occur manually. It's generally quite an easy process.
>
> Adi
> On Oct 6, 2011 7:22 AM, "Alex Little" wrote:
>
>
>
> > Hi all,
>
> > I have a clone of the ODK Collect (rc1) and with the release of rc2 I
> > wondered if there is a way to merge in the RC2 code changes into my
> > cloned version? I realise there could be some conflicts which I'd need
> > to resolve.
>
> > I had a look in the team options in Eclipse and also in the setting
> > page of my clone on Google code (https://code.google.com/r/alextlittle-
> > dc-odk/) - but I couldn't see any information that helped me figure
> > this out.
>
> > I've actually made relatively minor changes in our code, so if the
> > answer is the I just need to create a new clone and apply my changes
> > then thats ok - but would be nice if there's a way to keep my clone up
> > to date with the changes in the core.
>
> > Any help much appreciated!
> > Thanks,
> > Alex
>
> > --
> > Post: opendatakit@googlegroups.com
> > Unsubscribe: opendatakit+unsubscribe@googlegroups.com
> > Options:http://groups.google.com/group/opendatakit?hl=en