Skip to contentSkip to conversation

git upgrade question

Buildroot Dan Pattison 2 participants 2 messages Jun 8, 2009

lore
Share & tools
lore
#0 lore raw

Hello List,

I am using the 2009.02 release of BuildRoot. Is there any way using git to upgrade to 2009.05 without wiping out all of my changes and customizations? I have browsed the git website but found nothing about upgrading a build environment started with svn. Is there a git command to do this?

Thanks,
Dan Pattison

#1 lore raw

If you are working on the release you can patch create a patch from the 2009.02 release via

$ diff -u original-release-directory/ updated-directory/  > changes.patch
$ cd newest-release
$ patch -p1 < changes.patch

If you have used git to grab the checkout of the 2009.02 you can re-base your changes (but I don't know how to do that). That or just do an update and git should figure out what you have changed and what has changed in since 2009.02 in the official tree.

Regards Paul

Quoted 15 lines · Dan Pattison

Hello List,

I am using the 2009.02 release of BuildRoot. Is there any way using git to upgrade to 2009.05 without wiping out all of my changes and customizations? I have browsed the git website but found nothing about upgrading a build environment started with svn. Is there a git command to do this?

Thanks,
Dan Pattison

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 4 lines
----
Regards
Paul Archer
ptarcher at gmail.com