> On March 29, 2013, 12:03 a.m., Harsh Gupta wrote:
> > src/EngineController.cpp, line 793
> > <http://git.reviewboard.kde.org/r/108995/diff/2/?file=119751#file119751line793>
> >
> >     How am I suppose to stage changes in a line ( line 791 ) in which a 
> > variable is first renamed and then get deleted ? Should I commit all the 
> > changes again in order to make two different patches ?
> 
> Harsh Gupta wrote:
>     Oops... sorry for poor tagging !!! (first time  :P)
>     Line no. is actually 791.
> 
> Matěj Laitl wrote:
>     `git add -p` allows you to edit the hunks while staging, so you can use 
> it to "generate" changes that "annihilated". From "oldVarName" -> "" you can 
> create "oldVarname" -> "newVarName" -> "". (where oldVarName would be in 
> tree, newVarName would be in index (staged to commit) and "" would be in 
> working tree)
>     
>     But perhaps this is too complicated for an user new to git. You may 
> instead do:
>     1. start a new branch starting just a commit before your changes: git 
> branch newbranch oldbranch^ (or master^ if you've worked directly in master)
>     2. perform the exact same rename using your IDE (should be quick to do), 
> commit
>     3. check out the working tree of oldbranch (master?) without switching to 
> it: git checkout oldbranch -- .
>     4. `git diff` should show the "real" changes w/thout the renames; commit
>     5. now you have 2 commits, yay! Ensure that both commits build.

Should I submit both the patches in this review request one by one ?
PS: Please ignore my latest patch. I was expecting two different patches (one 
as a parent diff) but review board merged the two patches.


- Harsh


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/108995/#review30021
-----------------------------------------------------------


On April 1, 2013, 5:10 a.m., Harsh Gupta wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/108995/
> -----------------------------------------------------------
> 
> (Updated April 1, 2013, 5:10 a.m.)
> 
> 
> Review request for Amarok.
> 
> 
> Description
> -------
> 
> 1. Disabled Pre-amplifier in equalizer if it is not supported by phonon.
> 2. Fixed top and bottom labels of first slider. Earlier band name label was 
> at the top and slider value label was at the bottom for first slider.
> 3. Removed an extra semicolon EqualizerDialog.h .
> Note : I have made an assumption that if at all preamp is present then it 
> will the first element of Effect Parameter list.
> 
> 
> This addresses bug 301311.
>     https://bugs.kde.org/show_bug.cgi?id=301311
> 
> 
> Diffs
> -----
> 
>   src/EngineController.h 5de4beb 
>   src/EngineController.cpp 58d7360 
>   src/dialogs/EqualizerDialog.cpp 7d62e10 
>   src/dialogs/EqualizerDialog.ui 43b0187 
> 
> Diff: http://git.reviewboard.kde.org/r/108995/diff/
> 
> 
> Testing
> -------
> 
> All unit test cases passed.
> Note : I have tested it with gstreamer only. Xine phonon keep crashing on my 
> PC.
> 
> 
> File Attachments
> ----------------
> 
> Equalizer snapshot
>   http://git.reviewboard.kde.org/media/uploaded/files/2013/02/17/equalizer.png
> 
> 
> Thanks,
> 
> Harsh Gupta
> 
>

_______________________________________________
Amarok-devel mailing list
Amarok-devel@kde.org
https://mail.kde.org/mailman/listinfo/amarok-devel

Reply via email to