[Commotion-dev] Change to adhoc_ patch

[Hans-Christoph Steiner]

commotion-android.  I don't use github.com/guardianproject/olsr-mesh-tether any more, its just there to point people to the new commotion-android repo.

.hc

On May 11, 2012, at 2:44 PM, Will Hawkins wrote:

> Sure. Just a quick question: The master from which repo?
> 
> On 05/11/2012 02:36 PM, Hans-Christoph Steiner wrote:
>> 
>> I can't apply this patch with 'git am' or 'git apply', or the 'git diff' before it too, same error.  Could you rebase it against the head of master?
>> 
>> hans at dhcp-10 commotion-android $ git am ~/Desktop/0001-Change-to-adhoc_-from-mesh_.patch
>> Applying: Change to adhoc_ from mesh_
>> /Users/hans/code/commotion/commotion-android/.git/rebase-apply/patch:131: space before tab in indent.
>>        	e.putString(getString(R.string.adhoc_ip), myIP);
>> /Users/hans/code/commotion/commotion-android/.git/rebase-apply/patch:153: space before tab in indent.
>>    			if (k.equalsIgnoreCase(getString(R.string.adhoc_ip)))
>> error: assets/run: does not match index
>> error: native/wifi/main.cc: does not match index
>> error: res/values/strings.xml: does not match index
>> error: res/xml/preferences.xml: does not match index
>> error: src/net/szym/barnacle/BarnacleApp.java: does not match index
>> error: src/net/szym/barnacle/BarnacleService.java: does not match index
>> error: src/net/szym/barnacle/SettingsActivity.java: does not match index
>> Patch failed at 0001 Change to adhoc_ from mesh_
>> When you have resolved this problem run "git am --resolved".
>> If you would prefer to skip this patch, instead run "git am --skip".
>> To restore the original branch and stop patching run "git am --abort".
>> 
>> hans at dhcp-10 commotion-android $ git apply ~/Desktop/adhoc_name_patch.patch
>> /Users/hans/Desktop/adhoc_name_patch.patch:121: space before tab in indent.
>>        	e.putString(getString(R.string.adhoc_ip), myIP);
>> /Users/hans/Desktop/adhoc_name_patch.patch:143: space before tab in indent.
>>    			if (k.equalsIgnoreCase(getString(R.string.adhoc_ip)))
>> error: patch failed: assets/run:4
>> error: assets/run: patch does not apply
>> error: patch failed: res/values/strings.xml:59
>> error: res/values/strings.xml: patch does not apply
>> error: patch failed: res/xml/preferences.xml:60
>> error: res/xml/preferences.xml: patch does not apply
>> error: patch failed: src/net/szym/barnacle/BarnacleApp.java:101
>> error: src/net/szym/barnacle/BarnacleApp.java: patch does not apply
>> error: patch failed: src/net/szym/barnacle/BarnacleService.java:301
>> error: src/net/szym/barnacle/BarnacleService.java: patch does not apply
>> error: patch failed: src/net/szym/barnacle/SettingsActivity.java:28
>> error: src/net/szym/barnacle/SettingsActivity.java: patch does not apply
>> 
>> 
>> On May 11, 2012, at 2:15 PM, Will Hawkins wrote:
>> 
>>> Ah yes, I do remember git format-patch. Here is one for the most recent
>>> change. Let me know if this works for you. If so, we can just
>>> standardize on this method for shipping around patches.
>>> 
>>> Will
>>> 
>>> On 05/11/2012 01:18 PM, Hans-Christoph Steiner wrote:
>>>> 
>>>> The patch looks good, and the 'git diff' is ok.  But 'git format-patch' makes much nicer patches that apply nicely with 'git am'.  'git format-patch' saves all of the commit info, so when I include it with 'git am', it looks exactly like the commit in your repo.
>>>> 
>>>> Can you send a git format-patch?
>>>> 
>>>> .hc
>>>> 
>>>> On May 11, 2012, at 12:15 PM, Will Hawkins wrote:
>>>> 
>>>>> Hello.
>>>>> 
>>>>> Attached is a patch that changes the preference names from mesh_ to
>>>>> adhoc_ prefixes. I changed the lan_dns_server name to adhoc_dns_server
>>>>> for consistency. Please let me know if these patches are usable. In
>>>>> other words, please tell me if I used 'git diff' correctly.
>>>>> 
>>>>> Will
>>>>> <adhoc_name_patch.patch>_______________________________________________
>>>>> Commotion-dev mailing list
>>>>> Commotion-dev at lists.chambana.net
>>>>> http://lists.chambana.net/mailman/listinfo/commotion-dev
>>>> 
>>>> 
>>> 
>>> <0001-Change-to-adhoc_-from-mesh_.patch>_______________________________________________
>>> Commotion-dev mailing list
>>> Commotion-dev at lists.chambana.net
>>> http://lists.chambana.net/mailman/listinfo/commotion-dev
>> 
>> 
>