Quest for Nokia X2 CAF source - История изменений

Zombah: /* First merge attempt */ add save diff stats

2016-05-28T18:18:31Z

First merge attempt: add save diff stats

← Предыдущая версия		Версия от 18:18, 28 мая 2016
Строка 503:		Строка 503:
	CONFLICT (add/add): Merge conflict in AndroidKernel.mk		CONFLICT (add/add): Merge conflict in AndroidKernel.mk
	Automatic merge failed; fix conflicts and then commit the result.		Automatic merge failed; fix conflicts and then commit the result.
			</pre>

			===Save git diff stat into file===
			To save git diff --stat output to file or script and preserve diffed files path with bash shell use:
			<pre>
			git diff --stat=$COLUMNS <caf-branch> <vendor-branch> \| tee ~/caf-branch-vs-vendor-branch_diff_stat
	</pre>		</pre>

2016-05-26T11:46:58Z

add grep by soc gen

← Предыдущая версия		Версия от 11:46, 26 мая 2016
Строка 19:		Строка 19:
	echo , "$REV" >> ~/src/rdiffs-tags.csv;		echo , "$REV" >> ~/src/rdiffs-tags.csv;
	done		done
			</pre>

			you can limit search to only soc generation tag, if you know it, like this:
			<pre>
			for REV in $(git ls-remote --tags caf \|grep 8x10 \|awk '{ print $1; }'); do
	</pre>		</pre>

2016-05-24T22:57:08Z

add exec list

@@ Строка 1: / Строка 1: @@
-=Repo=
+==Repo==
 Working repo https://github.com/zombah/android_kernel_nokia_msm8610 <br/>
 ----
@@ Строка 498: / Строка 498: @@
 CONFLICT (add/add): Merge conflict in AndroidKernel.mk
 Automatic merge failed; fix conflicts and then commit the result.
 </pre>

2015-07-12T18:40:21Z

Initial search: add sort command

← Предыдущая версия		Версия от 18:40, 12 июля 2015
Строка 32:		Строка 32:
	210 files changed, 77918 insertions(+), 3386 deletions(-), ff17e00d86c6903f3ecf76b3c0ab60ef2d3acd27		210 files changed, 77918 insertions(+), 3386 deletions(-), ff17e00d86c6903f3ecf76b3c0ab60ef2d3acd27
	212 files changed, 77980 insertions(+), 3518 deletions(-), 1b94a153c7e82d7cec3809ac912b724725fcd80b		212 files changed, 77980 insertions(+), 3518 deletions(-), 1b94a153c7e82d7cec3809ac912b724725fcd80b
			</pre>

			sort output something like this:
			<pre>
			awk '{$2=$3=$5=$7=$8=""; print $0}' rdiffs-heads.csv \| sort -n -k 1 \|less
	</pre>		</pre>

Строка 41:		Строка 46:
	Closest head is: '''refs/heads/LNX.LA.3.2.7_rb1'''		Closest head is: '''refs/heads/LNX.LA.3.2.7_rb1'''
	Closes tags is: '''refs/tags/LNX.LA.3.2.7-00910-8x10.0'''		Closes tags is: '''refs/tags/LNX.LA.3.2.7-00910-8x10.0'''


	==First merge attempt==		==First merge attempt==

2015-06-01T22:10:26Z

add caf fetch

← Предыдущая версия		Версия от 22:10, 1 июня 2015
Строка 5:		Строка 5:
	==Initial search==		==Initial search==
	CAF added as remote repo name caf git://codeaurora.org/kernel/msm.git <br/>		CAF added as remote repo name caf git://codeaurora.org/kernel/msm.git <br/>
			<pre>
			git remote add caf git://codeaurora.org/kernel/msm.git
			git fetch caf
			</pre>

	Script to find difference between branch RM-1013-2.0.0.11 (gpl source released by Nokia) and CAF <br/>		Script to find difference between branch RM-1013-2.0.0.11 (gpl source released by Nokia) and CAF <br/>

2015-05-02T00:57:31Z

add separator

← Предыдущая версия		Версия от 00:57, 2 мая 2015
Строка 1:		Строка 1:
	=Repo=		=Repo=
	Working repo https://github.com/zombah/android_kernel_nokia_msm8610 <br/>		Working repo https://github.com/zombah/android_kernel_nokia_msm8610 <br/>
			----

	==Initial search==		==Initial search==

2015-05-02T00:55:15Z

fix format

← Предыдущая версия		Версия от 00:55, 2 мая 2015
Строка 1:		Строка 1:
			=Repo=
	Working repo https://github.com/zombah/android_kernel_nokia_msm8610 <br/>		Working repo https://github.com/zombah/android_kernel_nokia_msm8610 <br/>

	==~~Working repo~~==		==Initial search==
	CAF added as remote repo name caf git://codeaurora.org/kernel/msm.git <br/>		CAF added as remote repo name caf git://codeaurora.org/kernel/msm.git <br/>
	Script to find difference between branch RM-1013-2.0.0.11 (gpl source released by Nokia) and CAF <br/>		Script to find difference between branch RM-1013-2.0.0.11 (gpl source released by Nokia) and CAF <br/>

	~~==Initial search==~~
	<pre>		<pre>
	#!/bin/sh		#!/bin/sh

2015-05-02T00:53:45Z

breakline fix

← Предыдущая версия		Версия от 00:53, 2 мая 2015
Строка 1:		Строка 1:
	Working repo https://github.com/zombah/android_kernel_nokia_msm8610 </br>		Working repo https://github.com/zombah/android_kernel_nokia_msm8610 <br/>

	==Working repo==		==Working repo==
	CAF added as remote repo name caf git://codeaurora.org/kernel/msm.git </br>		CAF added as remote repo name caf git://codeaurora.org/kernel/msm.git <br/>
	Script to find difference between branch RM-1013-2.0.0.11 (gpl source released by Nokia) and CAF </br>		Script to find difference between branch RM-1013-2.0.0.11 (gpl source released by Nokia) and CAF <br/>

	==Initial search==		==Initial search==
Строка 38:		Строка 38:

	==First merge attempt==		==First merge attempt==
	But simple merge this branch with nokia source will not work becase of various conflicts, need to find what else nokia included		But simple merge this branch with nokia source will not work becase of various conflicts, <br/>
	into LNX.LA.3.2.7_rb1.		need to find what else nokia included into '''LNX.LA.3.2.7_rb1'''.

	git diff --stat LNX.LA.3.2.7-00910-8x10 RM-1013-2.0.0.11		git diff --stat LNX.LA.3.2.7-00910-8x10 RM-1013-2.0.0.11

2015-05-02T00:51:44Z

page init