[Kde-games-devel] Push kbreakout's QML port to a branch in git repo

[David Edmundson]

In a word, rebase.
This takes all your commits and pretends that you started doing them
on a different head, in this case "D" by replaying all your actions.

You want to do the following (just tested locally)

git clone kde:kbreakout
cd kbreakout
git remote add viranch kde:scratch/viranch/kbreakout-qml
git fetch viranch
git checkout viranch/master
git rebase -i master

This will then open an editor showing all your commits you've made since A.
Remove the line "pick Import KBreakout from SVN r1294380"

By removing this line it won't try re-adding this commit.

Save & exit

You will then see
"Successfully rebased and updated detached HEAD."


turn this modified branch into a new branch

git checkout -b viranch-qml (or whatever)

git push origin viranch-qml

to push your branch to the main kbreakout repository

David

(if you have questions, ping me on GTalk)

On Mon, Nov 5, 2012 at 3:29 PM, Viranch Mehta <viranch.mehta at gmail.com> wrote:
> Hi,
>
> I've been thinking of putting the QML port of KBreakout to a branch in the git repo on projects.kde.org. But I'm not sure how I'd go about doing this.
>
> Right now the port is in a scratch git repo. The initial commit to this repo is some not-so-old commit from the current repo. For clarity, lets say I started off porting at commit A in the original repo, and now the original repo has reached some commit D. The scratch repo has the code that was at commit A as initial commit (i had checked out from svn and done git init there). What I'm thinking of doing is:
>
> - clone the kbreakout git repo with head at commit D
> - checkout commit A
> - create a branch and push it
> - push the commits of scratch repo to this branch in original repo
>
> the problem here is: the first commit in scratch repo would be kind of an ugly conflict because that commit essentially adds all the files to the repo. i'm not sure if this is the right way.
>
> is there a better way to do this?
>
> Thanks,
> Viranch
> _______________________________________________
> kde-games-devel mailing list
> kde-games-devel at kde.org
> https://mail.kde.org/mailman/listinfo/kde-games-devel