[Pkg-vala-devel] pkg-vala?

Loïc Minier lool at dooz.org
Mon Oct 1 11:00:34 UTC 2007


On Mon, Oct 01, 2007, Sebastian Dröge wrote:
> Weird, it only builds for me if valac is already installed OR
> if I don't apply the patch. Sounds like a timestamp problem :(
> I'll take care of this...
> 
> (Were my commits correct? Confused me that it went to the upstream head
> instead of the unstable head)

 Hmm no, you committed to the upstream branch instead of the Debian one,
 but I made a mistake myself when pushing the initial copy of vala from
 my private repo to the new one.  I fixed both.

 You should:
    % git clone ssh://git.debian.org/git/pkg-vala/vala.git

 This will give you a "vala" dir with a new debian-unstable branch open:
    % git branch
    * debian-unstable
 (debian-unstable is branched from origin/debian-unstable, IOW it's your
 local branch for the remote debian-unstable branch)

 Do some changes, the "git commit -a" to commit them in the
 debian-unstbale branch.  When you're done, "git push" or "git push
 ssh://git.debian.org/git/pkg-vala/vala.git".


 You shouldn't have to use the "upstream-unstable" branch, unless you
 have to update to a new upstream release.  In this case, you should:
    % git checkout -b upstream-unstable origin/upstream-unstable
    (You only need -b and the last arg the first time you create your
    local upstream-unstable branch from origin/upstream-unstable; you
    can drop the -b the next times.)

 then unpack the tarball and commit it, or use git-buildpackage to do
 so.

 Don't forget to push to the remote upstream-unstable branch; it should
 be the default if you pulled from the remote upstream-unstable branch.
 You can also check your .git/config, it should look like:
    [remote "origin"]
            url = ssh://git.debian.org/git/pkg-vala/vala.git
            fetch = +refs/heads/*:refs/remotes/origin/*
    [branch "debian-unstable"]
            remote = origin
            merge = refs/heads/debian-unstable
    [branch "upstream-unstable"]
            remote = origin
            merge = refs/heads/upstream-unstable



 Here's how I fixed the commits being on the wrong branch:
 1) pull the changes you did in upstream-unstable in the debian-unstable
 branch:
    % git checkout debian-unstable
    % git merge upstream-unstable
    (this gives a completely linear history as no other change was made
    to debian-unstable or upstream-unstable)
    % git push origin debian-unstable
    (only pushes the debian branch)

    % git checkout upstream-unstable
    % git reset --hard HEAD^^
    (revert two revisions)
    % git push origin :upstream-unstable
    (delete remote upstream-unstable ref)
    % git push origin upstream-unstable
    (push the new upstream-unstable)


-- 
Loïc Minier



More information about the Pkg-vala-devel mailing list