[oe-commits] [openembedded-core] 37/116: devtool: upgrade: fix constructing new branch from tarball releases

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 666f390901245ae9b54b93e61292b7d2ab6d39a4
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Tue Feb 23 12:01:44 2016 +1300

    devtool: upgrade: fix constructing new branch from tarball releases
    
    When we do an upgrade from one tarball version to another we want to:
    
    1) Check out the old version as a new branch
    2) Record the changes between the old and new versions as a commit
    3) Check out the old version with patches applied
    4) Rebase that onto the new branch
    
    Where we went wrong was step #1 where instead we checked out the old
    version with patches applied as the new branch, which meant the rebase
    didn't do anything and any changes made by the patches to files still in
    the new version were wiped out.
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/lib/devtool/upgrade.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index 9a308b1..fab7b15 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -179,7 +179,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, branch, keep_temp, tin
         md5 = None
         sha256 = None
     else:
-        __run('git checkout -b devtool-%s' % newpv)
+        __run('git checkout devtool-base -b devtool-%s' % newpv)
 
         tmpdir = tempfile.mkdtemp(prefix='devtool')
         try:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.