Attend XDA's Second Annual Developer Conference, XDA:DevCon 2014!
5,804,192 Members 38,136 Now Online
XDA Developers Android and Mobile Development Forum

We need a new dev for cm

Tip us?
 
scotte9999
Old
#21  
scotte9999's Avatar
Senior Member
Thanks Meter 78
Posts: 222
Join Date: Feb 2008
Location: San Diego
I think you need to be in the directory of the repository to do the git revert (e.g., if you're in android/system then you can only revert commits from whatever repository populated that directory). Is android/system where the commits were to? (I thought they were to somewhere else).

Seems like you are on the right track with everything. For a quick and dirty test, you could just manually revert the commits (read: go edit the files yourself). It'll get blown away on a sync, but would be a way to get a (potentially) working build w/o debugging the git revert.
The Following User Says Thank You to scotte9999 For This Useful Post: [ Click to Expand ]
 
phred14
Old
#22  
Junior Member
Thanks Meter 0
Posts: 12
Join Date: Aug 2014
Location: Burlington, Vt
Quote:
Originally Posted by scotte9999 View Post
I think you need to be in the directory of the repository to do the git revert (e.g., if you're in android/system then you can only revert commits from whatever repository populated that directory). Is android/system where the commits were to? (I thought they were to somewhere else).

Seems like you are on the right track with everything. For a quick and dirty test, you could just manually revert the commits (read: go edit the files yourself). It'll get blown away on a sync, but would be a way to get a (potentially) working build w/o debugging the git revert.
Second attempt:
Code:
~/android/system/vendor/samsung $ git revert -m 1 187689ea76effd42b680a147d080512ac62a0fed
error: Mainline was specified but commit 187689ea76effd42b680a147d080512ac62a0fed is not a merge.
fatal: revert failed
This time instead of being at the top of my android tree I went down to what looked like the "relative top" for the changes. It seemed to like where I was running the command, but this time it didn't like the handle I fed it. I'd seen some references to just the first 7 characters and tried again feeding it that, but got the same message, including having my 7 characters fleshed out into the full string. If I read that message correctly, it wants a "merge handle", not a "commit handle", but I don't have one of those. No doubt someone with git-fu can query one to get the other. Never mind - it's
git log 187689ea76effd42b680a147d080512ac62a0fed
but at that point I'm still not sure how to track down the right handle. From that command I get:
Code:
commit 187689ea76effd42b680a147d080512ac62a0fed
Author: Ethan Chen <intervigil@gmail.com>
Date:   Mon Jul 28 12:36:03 2014 -0700

    apexqtmo: Inherit from common msm8960 proprietary files

commit aecee5463eeb1e78001c9b386553f5a47cb981ae
Author: Ethan Chen <intervigil@gmail.com>
Date:   Mon Jul 28 11:23:12 2014 -0700

    d2lte: Move common d2lte libs into msm8960-common
    
    * Allow apexqtmo and expressatt to inherit these as well

commit d2fdc56232745b32aca5fee7cc0fcb3511a9a503
Merge: 9338358 399f67a
(and then a lot more output, further into the past)
So I figure Aha! 9338358 is the handle I'm looking for. I see that 399f67a seems to get involved with earlier stuff. But now:
Code:
~/android/system/vendor/samsung $ git revert -m 1 9338358
error: Mainline was specified but commit 933835865d048a653979cd7a66df7320779e94cc is not a merge.
fatal: revert failed
So that's not it. Incidentally, the root of these changes seems to be a phone called "piranha", for what it's worth.

Especially the second commit touches something like 100 files, so I don't think I want to take that one on by hand.

Over in the Relay developer's forum (where I can't post, at least not yet, because I'm not a developer) I see "tdm" possibly picking up for the Relay. Since I can't post I sent him a PM thanking him and letting him know that I'm interested in helping.
 
scotte9999
Old
#23  
scotte9999's Avatar
Senior Member
Thanks Meter 78
Posts: 222
Join Date: Feb 2008
Location: San Diego
Quote:
Originally Posted by phred14 View Post
Second attempt:
Code:
~/android/system/vendor/samsung $ git revert -m 1 187689ea76effd42b680a147d080512ac62a0fed
error: Mainline was specified but commit 187689ea76effd42b680a147d080512ac62a0fed is not a merge.
fatal: revert failed
I don't understand. I just did "git revert aecee5463eeb1e78001c9b386553f5a47cb981ae" in vendor/samsung and it reverted without incident.

Quote:
Originally Posted by phred14 View Post
Over in the Relay developer's forum (where I can't post, at least not yet, because I'm not a developer) I see "tdm" possibly picking up for the Relay. Since I can't post I sent him a PM thanking him and letting him know that I'm interested in helping.
Because you're not a developer? WTF? I didn't know XDA had such rules (I'm not a developer by any XDA mark, so far as I know, and can post in that forum). Anyway, looks like @tdm is making progress, so hopefully he can share what he did to get the build sort-of working.
The Following User Says Thank You to scotte9999 For This Useful Post: [ Click to Expand ]
 
Magamo
Old
#24  
Senior Member
Thanks Meter 225
Posts: 254
Join Date: Oct 2012
He needs to have had at least ten posts to post unrestricted in the dev forum.
TeamApexQ -- irc.freenode.net/#apexqtmo
The Following User Says Thank You to Magamo For This Useful Post: [ Click to Expand ]
 
phred14
Old
#25  
Junior Member
Thanks Meter 0
Posts: 12
Join Date: Aug 2014
Location: Burlington, Vt
I got it to work. The clue was your git command. Looking at the directions you pointed me to, I thought I needed a "-m 1" in there between the "git revert" and the commit number. Then but it told me I needed to do a git stash or commit for my local changes before I could do the revert. I hadn't thought I had changed anything, but figured a "git stash" wouldn't hurt. Then both reverts worked, and I captured all output for later reference.

After that I built another rom image, which had today's date, even if it's from the same repo sync as my first image. Now I have two things I can directly compare. I also took tarballs of the vendor/samsung directories, both ways.

Not enough time tonight, but hopefully this weekend I can try my first image. Of course I'll also keep an eye on how tld(?) is doing. He's no doubt further along than me, but I can at least test for him.

(This is my 11th post, so maybe I'll add something there, based on what he says next.)
Thread Tools Search this Thread
Search this Thread:

Advanced Search
Display Modes