Bug 3419 - Wrap git merge command
Summary: Wrap git merge command
Status: RESOLVED FIXED
Alias: None
Product: Kernel
Classification: Yocto Project Subprojects
Component: kernel-tooling (show other bugs)
Version: 1.3
Hardware: x86 Multiple
: Low normal
Target Milestone: 1.4 M6
Assignee: Bruce Ashfield
QA Contact:
URL:
Whiteboard:
Depends on:
Blocks:
 
Reported: 2012-11-13 18:37 UTC by Darren Hart
Modified: 2013-03-19 13:16 UTC (History)
2 users (show)

See Also:
OS type for building Yocto: ---
Type of Regression: ---
Verified:
Documentation change: ---

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Darren Hart 2012-11-13 18:37:16 UTC 
In order to clean up the typical usage in the BSP scc files and provide a complete reference with which to model our documentation, the kernel-tools need to wrap the "git merge" command so that "merge" can be used in a parallel manner to "branch" within the BSP scc files. This also ensures safe usage which is important for a documented feature.
Comment 1 Bruce Ashfield 2012-11-14 18:14:59 UTC 
accepting and adding the time estimate.
Comment 2 Bruce Ashfield 2013-02-28 14:07:06 UTC 
This has been sent to the oe-core mailing list.
Comment 3 Bruce Ashfield 2013-03-19 13:16:00 UTC 
commit c7ec19d55aca6c4b17073c5362fce5be61a89d82
Author: Bruce Ashfield <bruce.ashfield@windriver.com>
Date:   Thu Feb 7 16:32:28 2013 -0500

    scc: wrap git merge
    
    To allow for parameter validation and sanity checking, wrap "git merge"
    as a dedicated "merge" command instead of using the raw git fallback.
    
    This also makes it consistent with existing top level commands such
    as  'tag', 'branch', 'patch', etc.
    
    There are no changes to arguments, and existing 'git merge' commands
    continue to work with this change.
    
    Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

:100755 100755 eabece4... 0de55a4... M  tools/scc

Documentation updates send to Scott as well.