GNOME Bugzilla – Bug 723036
User help does not have a license
Last modified: 2014-11-21 00:01:15 UTC
Created attachment 267243 [details] [review] Add CC-by-SA (TODO: mdhill, jinca) The user help should be licensed under CC-by-SA 3.0
Created attachment 267244 [details] [review] Add CC-by-SA (TODO: mdhill, jinca, Daniel Mustieles, Gabor Kelemen, Paolo Borelli, Stefano Facchini)
To sign off the patches, first apply the patch, then sign it off: $ git am <patchname> $ git format-patch -1 --signoff
Created attachment 267256 [details] [review] patch signed off
Comment on attachment 267243 [details] [review] Add CC-by-SA (TODO: mdhill, jinca) signed off
Created attachment 267257 [details] [review] patch signed off
Comment on attachment 267244 [details] [review] Add CC-by-SA (TODO: mdhill, jinca, Daniel Mustieles, Gabor Kelemen, Paolo Borelli, Stefano Facchini) signed off
Created attachment 267261 [details] [review] patch signoff
Created attachment 267263 [details] [review] patch signoff
Comment on attachment 267261 [details] [review] patch signoff Pushed to master in commit 478745c6582181533769d5ee2472c20aa5b19d4b
Comment on attachment 267263 [details] [review] patch signoff This patch needs to be signed off by Daniel Mustieles, Gabor Kelemen, Paolo Borelli and Stefano Facchini before it can be pushed to master.
Patch applies properly, but I'm getting the following error when I run git am <patchname>: $ git am 0002-Relicense-user-help-part-2.patch Applying: Relicense user help, part 2 error: help/C/pref-view-chart.page: does not match index error: help/C/scan-file-system.page: does not match index error: help/C/scan-folder.page: does not match index error: help/C/scan-home.page: does not match index error: help/C/scan-remote.page: does not match index Patch failed at 0001 Relicense user help, part 2 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". Am I doing something wrong? Thanks!
Hi Daniel, did you pull changes from the server before you tried applying the patch? You should also check if you have any uncommitted changes using 'git status' and committed, but not pushed changes using 'git log'. It would be a good idea to abort the 'git am' before trying to pull changes. Hopefully that will work!
Yes, I've pulled changes before commiting the patch, and have no pending changes to commit... don't know what's happening
(In reply to comment #13) > Yes, I've pulled changes before commiting the patch, and have no pending > changes to commit... don't know what's happening Hi, I tried applying it to a clean checkout just now and it worked for me. Can you try doing 'git branch' to check that you're on master, then 'git reset --hard origin/master' to make sure you definitely don't have any other changes, then applying the patch again?
I've cloned a fresh copy of the module, and still get the same error... These are the steps I'm following: Download the last patch sent by Julita (https://bugzilla.gnome.org/attachment.cgi?id=267263) git clone ssh://dmustieles@git.gnome.org/git/baobab cp <path_to_patch> baobab/ cd baobab git apply 0002.... (until here, everything goes ok) git am 0002.... (here I got the previous error) Have I missed any step or maybe I'm applying the wrong patch? Thanks for your help and sorry for the incovenience
Ah, you don't need to do 'git apply': that's generally used only when something is broken or for diffs. Skip that step and everything else should work :)
Created attachment 267293 [details] [review] Patch signed Ahhhhh... I got confused, because I thought I had to apply the patch and then sign it... sorry! Now it has worked properly, and here is the patch signed. Thanks again for your help!
I saw a message on irc by Kat. Feel free to go ahead
I was asked on irc by Kat to comment here. I'm fine with relicensing my tiny contribution to these docs.
Comment on attachment 267293 [details] [review] Patch signed Pushed to master in commit cab0027d9cae4651999bc2a88a90c50d66dacd86 Pushed to gnome-3-14 in 35361b6cabc1c586f3c4a6e4c02db100435d409c Gabor and Paolo signed off in this bug instead of the patch and the change by Stefano Facchini was not creative (typo fix) so does not really need signing off.