Paul Eggleton 93a1c01666 devtool: upgrade: tweak conflict handling ... Make a couple of changes to the rebase operation: 1) Only wrap the actual rebase command in try...except since a failure in any of the other commands should be an error, not a warning 2) If it's a conflict (which unfortunately we can only tell by checking for the keyword "conflict" since git doesn't return error codes based on the type of error) then print a message clarifying that the user needs to resolve the issue themselves to finish the upgrade. (From OE-Core rev: 2a76be958432a35a0de30e9a5433089a54a06cad) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>		2016-05-25 07:50:16 +01:00
..
bsp	scripts/lib/bsp/kernel.py: force patching when branch is machine branch is re-use	2016-05-06 10:32:24 +01:00
devtool	devtool: upgrade: tweak conflict handling	2016-05-25 07:50:16 +01:00
recipetool	recipetool: create: fix falling back to declared license for npm packages	2016-05-06 10:31:14 +01:00
wic	wic: fix path parsing, use last occurrence	2016-05-20 10:20:55 +01:00
argparse_oe.py	scripts/lib/argparse_oe: also change 'positional arguments' to 'arguments'	2016-05-06 10:31:13 +01:00
scriptpath.py	scripts: consolidate code to find bitbake path	2014-06-25 13:51:45 +01:00
scriptutils.py	devtool / recipetool: use common code for launching editor	2016-02-21 09:32:42 +00:00