Re: stuck on git (again)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Neal Becker wrote:

> $ fedpkg push
> Everything up-to-date
> $ fedpkg build
> Could not initiate build: There are unpushed changes in your repo
> 
> Clue?
> 

Here's what I tried to do.
After clone, then build for F15 OK.

 git merge -m "Initial pseudo merge for dist-git setup" -s ours 
origin/{f12,f13}/master

OK, now try f13 branch:

 fedpkg switch-branch f13

I see my f13 files are not updated, so I do:

 git merge master
Updating 095f524..d2d9bec
Fast-forward
 .gitignore  |    1 +
 Cython.spec |   11 ++++++++---
 sources     |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

Now seems to be updated.

 git push
Counting objects: 1, done.
Writing objects: 100% (1/1), 259 bytes, done.
Total 1 (delta 0), reused 0 (delta 0)
To ssh://nbecker@xxxxxxxxxxxxxxxxxxxxxx/Cython
   793e85d..d2d9bec  master -> master

Then:

fedpkg build
Could not initiate build: There are unpushed changes in your repo

fedpkg push
Everything up-to-date


-- 
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/devel


[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Fedora Announce]     [Fedora Kernel]     [Fedora Testing]     [Fedora Formulas]     [Fedora PHP Devel]     [Kernel Development]     [Fedora Legacy]     [Fedora Maintainers]     [Fedora Desktop]     [PAM]     [Red Hat Development]     [Gimp]     [Yosemite News]
  Powered by Linux