Mailinglist Archive: radeonhd (408 mails)

< Previous Next >
Re: [radeonhd] build fails after latest 'git pull'
  • From: "David C. Rankin, J.D.,P.E." <drankinatty@xxxxxxxxxxxxxxxxxx>
  • Date: Tue, 16 Jun 2009 13:31:09 -0500
  • Message-id: <200906161331.09407.drankinatty@xxxxxxxxxxxxxxxxxx>
On or about Tuesday 16 June 2009 at approximately 13:06:52 Rafał Miłecki
composed:
2009/6/16 David C. Rankin, J.D.,P.E. <drankinatty@xxxxxxxxxxxxxxxxxx>:
On or about Tuesday 16 June 2009 at approximately 12:29:46 Rafał Miłecki

composed:
2009/6/16 David C. Rankin, J.D.,P.E. <drankinatty@xxxxxxxxxxxxxxxxxx>:
On or about Tuesday 16 June 2009 at approximately 10:47:13 Rafał
Miłecki

composed:
git checkout src/rhd_pm.c

Now what? I did that and I'm in vi looking at:

Er, is this already merged/commited...? Just checkout origin/master as
new clean branch, as I said :) This will be the easiest.

--
Rafał Miłecki

err, um ... Crap! I have got to "get" better with "git".

Rafal, I'm stuck.

       Obviously the fix is simple and it is probably a simple as
applying the randr patch.

12:53 alchemy:~/archlinux/apps/radeonhd> git pull
Updating 08acc05..8a3fa92
Fast forward
 src/r600_reg_r6xx.h |    2 +-
 src/r6xx_accel.c    |    1 +
 src/rhd_atombios.c  |  135
++++++++++++++++++++++++++++++++++++++++++++++- src/rhd_atombios.h  |  
 5 ++
 src/rhd_cs.c        |    2 +-
 src/rhd_dig.c       |    6 +-
 src/rhd_driver.c    |  144
++++++++++++++++-----------------------------------
 src/rhd_id.c        |   16 ++++--
 src/rhd_lvtma.c     |    4 +-
 src/rhd_mc.c        |    7 ++-
 src/rhd_pll.c       |   12 ++++-
 src/rhd_pm.c        |  119 +++++++++++++++++++++++++++++++++++-------
 src/rhd_pm.h        |    6 ++-
 src/rhd_randr.c     |   74 ++++++++++++++++++++++++--
 src/rhd_regs.h      |    2 -
 15 files changed, 389 insertions(+), 146 deletions(-)
12:53 alchemy:~/archlinux/apps/radeonhd> git show-branch
[master] randr: Reformat AtomBIOS parameter correctly when setting.
12:53 alchemy:~/archlinux/apps/radeonhd> git show
12:54 alchemy:~/archlinux/apps/radeonhd> git branch
* master
12:55 alchemy:~/archlinux/apps/radeonhd> git checkout -t -b clean
master/origin
fatal: git checkout: updating paths is incompatible with switching
branches. Did you intend to checkout 'master/origin' which can not be
resolved as commit?

       Can you help a brother out? What do I need to do to get back in
sync? Thanks.

Try this:
git commit -a -m garbages
git checkout -t -b clean origin/master
git pull
make

You (or me in instruction) mistaken origin/master with master/origin.

--
Rafał Miłecki

Thanks Rafal!

Before your last email, I got it to build fine:

make[3]: Leaving directory
`/home/david/archlinux/apps/radeonhd/utils/conntest'
make[2]: Leaving directory
`/home/david/archlinux/apps/radeonhd/utils/conntest'
make[2]: Entering directory `/home/david/archlinux/apps/radeonhd'
make[2]: Leaving directory `/home/david/archlinux/apps/radeonhd'
make[1]: Leaving directory `/home/david/archlinux/apps/radeonhd'

As for the master/origin:

<quote>

Right, one of the ways may be to checkout clean branch, and just remove
earlier:
git checkout -t -b clean master/origin
git branch -D name_of_old_one

--
Rafał Miłecki

</quote>

Man you really know how to drive a git newb crazy :-)

13:26 alchemy:~/archlinux/apps/radeonhd> git commit -a -m garbages
# On branch master
# Your branch is ahead of 'origin/master' by 2 commits.
#
nothing to commit (working directory clean)

13:29 alchemy:~/archlinux/apps/radeonhd> git checkout -t -b clean
origin/master
Branch clean set up to track remote branch master from origin.
Switched to a new branch 'clean'

We are up to date, compile is fine, and I'll report back on any
changes/improvements to the exhaust or palm-rest temps. Thanks again!

--
David C. Rankin, J.D.,P.E.
Rankin Law Firm, PLLC
510 Ochiltree Street
Nacogdoches, Texas 75961
Telephone: (936) 715-9333
Facsimile: (936) 715-9339
www.rankinlawfirm.com
--
To unsubscribe, e-mail: radeonhd+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: radeonhd+help@xxxxxxxxxxxx

< Previous Next >
Follow Ups