On 3/1/2011 9:08 PM, Andrew Deason wrote:
On Tue, 01 Mar 2011 19:30:06 -0500
Jeff Blaine<jbla...@kickflop.net> wrote:
I'm a TOTAL git newbie, so for the sake of full disclosure, here
is how I did the patching:
git clone http://git.openafs.org/git/openafs.git
git branch openafs-stable-1_4_14
git checkout 514256cd403c15da7acf6601aa11371504f856fe
[...]
...not exactly :)
After you clone, you do
git checkout openafs-stable-1_4_14
git cherry-pick<commit1>
git cherry-pick<commit2>
...
git cherry-pick<commitN>
Or you can go in to the gitweb interface, get the patch for each of
those commits, and apply them manually. But that's only if you're scared
of git :)
In any case, that's not your problem, though. By chance, you checked out
code pretty close to the head of the 1.4.x branch, and it has all of the
patches I mentioned. The reason you have a panic is that the patches I
mentioned are not sufficient (I apologize, but the road to getting the
Solaris client stoppable has been long, and I forget what's where).
What you want to do is do the above steps, and then apply two patches
that I forgot to mention that aren't in 1.4.x yet:
http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=6b6064ccacc60eb5a1fe45cc69c65fb621e8980c
http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=885dfd0e9d0cb6b4e2e32280a9266d1776ea6859
Okay, I give up. Diffs + patch, here I come.
tmp:cairo> rm -rf openafs-1.4.14-PATCHED
tmp:cairo> git clone http://git.openafs.org/git/openafs.git
openafs-1.4.14-PATCHED
Initialized empty Git repository in /tmp/openafs-1.4.14-PATCHED/.git/
Checking out files: 100% (5359/5359), done.
tmp:cairo> cd openafs-1.4.14-PATCHED/
openafs-1.4.14-PATCHED:cairo> git branch openafs-stable-1_4_14
openafs-1.4.14-PATCHED:cairo> git cherry-pick
6b6064ccacc60eb5a1fe45cc69c65fb621e8980c
warning: too many files (created: 930 deleted: 984), skipping inexact
rename detection
Automatic cherry-pick failed. After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
and commit the result.
When commiting, use the option '-c 6b6064c' to retain authorship and
message.
openafs-1.4.14-PATCHED:cairo>
_______________________________________________
OpenAFS-info mailing list
OpenAFS-info@openafs.org
https://lists.openafs.org/mailman/listinfo/openafs-info
