Review Request: Not possible to select a project target in the "configure launches dialogue"

[Gerhard Stengel]

Hi,

sorry for not having it shipped so far, but I'm struggeling a bit with git as I've never used it so far and didn't want 
to mess anything up.
Please find the patch attached.

Even if it may sound really trivial for you experts I'd appreciate if someone could give me some advice:

- I created a "feature branch" from the kdevplatform 1.2 branch, commited the changes and merged it back to 1.2. So far 
everything went smoothly. But when I tried to merge it to "master", git tried to merge the whole feature branch which is 
based on 1.2 to master. How can I tell git just to merge a specific commit or some files?

- Which would have been the correct command to finally push it to the kde server? Would I just have to push the 1.2 and 
master branches (of course, I want to keep my trivial feature branch private). What's the meaning of origin/1.2 and 
origin/master?

I've my ssh key set up, so everything should basically work. I read a bit here
http://community.kde.org/Sysadmin/GitFAQ
but couldn't find an immediate answer to my questions.

regards

Gerhard

Am Donnerstag, 3. März 2011, 21:12:24 schrieb Milian Wolff:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/100692/#review1755
> -----------------------------------------------------------
> 
> Ship it!
> 
> 
> please send the patch as created by "git format-patch" and we will merge it, thanks
> 
> - Milian
> 
> 
> On Feb. 24, 2011, 10:44 p.m., Gerhard Stengel wrote:
> > 
> > -----------------------------------------------------------
> > This is an automatically generated e-mail. To reply, visit:
> > http://git.reviewboard.kde.org/r/100692/
> > -----------------------------------------------------------
> > 
> > (Updated Feb. 24, 2011, 10:44 p.m.)
> > 
> > 
> > Review request for KDevelop.
> > 
> > 
> > Summary
> > -------
> > 
> > There are two problems in the configure launches dialogue which are addressed by this fix
> > 
> > - the radio button left of the project target dropdown box isn't visible
> > - after you've entered a program name in the textbox next to "executable", closed the launch config dialogue and 
reopen it, it's no longer 
> > possible to select a project target again because the dropdown box stays empty. You have to close the dialogue and 
> > reopen it.
> > 
> > 
> > Diffs
> > -----
> > 
> >   plugins/execute/nativeappconfig.cpp b8520e0 
> >   plugins/execute/nativeappconfig.ui 51d53a4 
> > 
> > Diff: http://git.reviewboard.kde.org/r/100692/diff
> > 
> > 
> > Testing
> > -------
> > 
> > 
> > Thanks,
> > 
> > Gerhard
> > 
> >
> 
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-100692.patch
Type: text/x-patch
Size: 3768 bytes
Desc: not available
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20110303/dd845b04/attachment.patch>