Skip to Content.
Sympa Menu

sm-discuss - Re: [SM-Discuss] git and usability

sm-discuss AT lists.ibiblio.org

Subject: Public SourceMage Discussion List

List archive

Chronological Thread  
  • From: Andrew <afrayedknot AT thefrayedknot.armory.com>
  • To: sm-discuss AT lists.ibiblio.org
  • Subject: Re: [SM-Discuss] git and usability
  • Date: Tue, 18 Jul 2006 08:07:50 -0700

On Tue, Jul 18, 2006 at 03:18:48PM +0200, Ladislav Hagara wrote:
> >
> >> Seems Git Guide has not been changed from 2006-07-01.
> >> I would really appreciate if I could find out some kiss info about
> >> "integration, cherry-picking" from test (master) grimoire to stable-rc
> >> and stable grimoire,
> > git log # find the commit you want to integrate and its hash ($hash below)
> > git checkout stable-rc # to get to the branch you want to modify
> > git cherry-pick -e $hash# cherry-pick
>
>
> Seems I have to rebuild my git and enable some optional_dependencies (rcs):
>
> $ git cherry-pick -e 6c6bcb0793a90336d197c0092fa0e51715c95386
> First trying simple merge strategy to cherry-pick.
> Simple cherry-pick fails; trying Automatic cherry-pick.
> Auto-merging video-libs/xine-lib/DETAILS
> /usr/bin/git-merge-one-file: line 93: merge: command not found
> ERROR: Merge conflict in video-libs/xine-lib/DETAILS

Need rcs for the merge command, its an optional depends of git. I didnt
enable it either. The optional depends message should be more obvious.

-Andrew


--
_________________________________________________________________________
| Andrew D. Stitt | acedit at armory.com | astitt at sourcemage.org |
| irc: afrayedknot | Sorcery Team Lead | ftp://t.armory.com/ |
| 1024D/D39B096C | 76E4 728A 04EE 62B2 A09A 96D7 4D9E 239B D39B 096C |
-------------------------------------------------------------------------




Archive powered by MHonArc 2.6.24.

Top of Page