i tried to push a commit, but push failed like this:
$ eg push jh@git.sip-router.org's password: Counting objects: 9, done. Delta compression using up to 2 threads. Compressing objects: 100% (5/5), done. Writing objects: 100% (5/5), 1.19 KiB, done. Total 5 (delta 4), reused 0 (delta 0) error: hooks/update exited with error code 1 error: hook declined to update refs/heads/master To ssh://jh@git.sip-router.org/sip-router ! [remote rejected] master -> master (hook declined) error: failed to push some refs to 'ssh://jh@git.sip-router.org/sip-router'
the error message does not say anything useful to normal user.
-- juha
On Jun 09, 2010 at 12:33, Juha Heinanen jh@tutpro.com wrote:
i tried to push a commit, but push failed like this:
$ eg push jh@git.sip-router.org's password: Counting objects: 9, done. Delta compression using up to 2 threads. Compressing objects: 100% (5/5), done. Writing objects: 100% (5/5), 1.19 KiB, done. Total 5 (delta 4), reused 0 (delta 0) error: hooks/update exited with error code 1 error: hook declined to update refs/heads/master To ssh://jh@git.sip-router.org/sip-router ! [remote rejected] master -> master (hook declined) error: failed to push some refs to 'ssh://jh@git.sip-router.org/sip-router'
Somehow the file with per-branch permissions disappeared and by default the policy is deny except for user branches ( e.g.. andrei/...).
I've restored it and it should work now.
Strange thing is that the last modification time on the directory holding this file was 2010-06-09 02:15 (cronjob?). We will need to investigate further (to see if it was deleted by mistake, cronjob ran amok or some fs error).
Andrei
Andrei Pelinescu-Onciul writes:
I've restored it and it should work now.
andrei,
yes, thanks, now push to master worked, but when i switched to k branch and did pull, i got new errors:
$ eg switch kamailio_3.0 Switched to branch 'kamailio_3.0' Your branch and 'origin/kamailio_3.0' have diverged, and have 1 and 3 different commit(s) each, respectively. $ eg pull jh@git.sip-router.org's password: Removing pkg/kamailio/debian-etch/patches/00list Removing pkg/kamailio/debian-etch/patches/10_no_lib64_on_64_bits.dpatch Removing pkg/kamailio/debian-etch/patches/11_always_smp.dpatch CONFLICT (directory/file): There is a directory with name pkg/kamailio/debian-lenny in HEAD. Adding pkg/kamailio/debian-lenny as pkg/kamailio/debian-lenny~3224810f6fc75b0f7a498e8bfe3947c0e05bc98f Removing pkg/kamailio/debian-lenny/changelog Removing pkg/kamailio/debian-lenny/rules Automatic merge failed; fix conflicts and then commit the result.
--juha
On Jun 09, 2010 at 15:26, Juha Heinanen jh@tutpro.com wrote:
Andrei Pelinescu-Onciul writes:
I've restored it and it should work now.
andrei,
yes, thanks, now push to master worked, but when i switched to k branch and did pull, i got new errors:
$ eg switch kamailio_3.0 Switched to branch 'kamailio_3.0' Your branch and 'origin/kamailio_3.0' have diverged, and have 1 and 3 different commit(s) each, respectively. $ eg pull jh@git.sip-router.org's password: Removing pkg/kamailio/debian-etch/patches/00list Removing pkg/kamailio/debian-etch/patches/10_no_lib64_on_64_bits.dpatch Removing pkg/kamailio/debian-etch/patches/11_always_smp.dpatch CONFLICT (directory/file): There is a directory with name pkg/kamailio/debian-lenny in HEAD. Adding pkg/kamailio/debian-lenny as pkg/kamailio/debian-lenny~3224810f6fc75b0f7a498e8bfe3947c0e05bc98f Removing pkg/kamailio/debian-lenny/changelog Removing pkg/kamailio/debian-lenny/rules Automatic merge failed; fix conflicts and then commit the result.
I don't know what eg does, but (after making a quick backup of the tree), try the following:
# revert to the state before the pull/merge # (warning: any not comited changes will be permanently lost, that's # the main reason for the backup) git reset --hard ORIG_HEAD # if everything is ok (your commit should be ontop) # rebase on top of the repository version of kamailio_3.0 git rebase origin/kamailio_3.0 # push your changes back git push origin kamailio_3.0:kamilio_3.0
If you still got errors, try again git reset --hard ORIG_HEAD, delete pkg/kamailio/debian-lenny and then continue with the rebase.
If it still doesn't work, reset --hard ORIG_HEAD again, and send me the output of: git log ^HEAD origin/kamailio_3.0 git log HEAD ^origin/kamailio_3.0 git diff git diff --cached git status
Andrei
Sorry guys, I might have incidentally changed something in the sip-router repository yesterday when I was configuring a new repository for sems. Let me check--if it stil does not work we could re-create the state of the repository as it was yesterday from a backup.
-Jan
On Wed, Jun 9, 2010 at 11:12 AM, Andrei Pelinescu-Onciul andrei@iptel.org wrote:
On Jun 09, 2010 at 15:26, Juha Heinanen jh@tutpro.com wrote:
Andrei Pelinescu-Onciul writes:
I've restored it and it should work now.
andrei,
yes, thanks, now push to master worked, but when i switched to k branch and did pull, i got new errors:
$ eg switch kamailio_3.0 Switched to branch 'kamailio_3.0' Your branch and 'origin/kamailio_3.0' have diverged, and have 1 and 3 different commit(s) each, respectively. $ eg pull jh@git.sip-router.org's password: Removing pkg/kamailio/debian-etch/patches/00list Removing pkg/kamailio/debian-etch/patches/10_no_lib64_on_64_bits.dpatch Removing pkg/kamailio/debian-etch/patches/11_always_smp.dpatch CONFLICT (directory/file): There is a directory with name pkg/kamailio/debian-lenny in HEAD. Adding pkg/kamailio/debian-lenny as pkg/kamailio/debian-lenny~3224810f6fc75b0f7a498e8bfe3947c0e05bc98f Removing pkg/kamailio/debian-lenny/changelog Removing pkg/kamailio/debian-lenny/rules Automatic merge failed; fix conflicts and then commit the result.
I don't know what eg does, but (after making a quick backup of the tree), try the following:
# revert to the state before the pull/merge # (warning: any not comited changes will be permanently lost, that's # the main reason for the backup) git reset --hard ORIG_HEAD # if everything is ok (your commit should be ontop) # rebase on top of the repository version of kamailio_3.0 git rebase origin/kamailio_3.0 # push your changes back git push origin kamailio_3.0:kamilio_3.0
If you still got errors, try again git reset --hard ORIG_HEAD, delete pkg/kamailio/debian-lenny and then continue with the rebase.
If it still doesn't work, reset --hard ORIG_HEAD again, and send me the output of: git log ^HEAD origin/kamailio_3.0 git log HEAD ^origin/kamailio_3.0 git diff git diff --cached git status
Andrei
On Jun 09, 2010 at 12:01, Jan Janak jan@iptel.org wrote:
Sorry guys, I might have incidentally changed something in the sip-router repository yesterday when I was configuring a new repository for sems. Let me check--if it stil does not work we could re-create the state of the repository as it was yesterday from a backup.
So far the only problem was the missing info/allowed-users. I md5'ed all the other hooks and they are the original version.
The repository data looks ok so far. I don't think Juha's pull conflict is related to it.
Andrei
On Wed, Jun 9, 2010 at 11:12 AM, Andrei Pelinescu-Onciul andrei@iptel.org wrote:
On Jun 09, 2010 at 15:26, Juha Heinanen jh@tutpro.com wrote:
Andrei Pelinescu-Onciul writes:
I've restored it and it should work now.
andrei,
yes, thanks, now push to master worked, but when i switched to k branch and did pull, i got new errors:
$ eg switch kamailio_3.0 Switched to branch 'kamailio_3.0' Your branch and 'origin/kamailio_3.0' have diverged, and have 1 and 3 different commit(s) each, respectively. $ eg pull jh@git.sip-router.org's password: Removing pkg/kamailio/debian-etch/patches/00list Removing pkg/kamailio/debian-etch/patches/10_no_lib64_on_64_bits.dpatch Removing pkg/kamailio/debian-etch/patches/11_always_smp.dpatch CONFLICT (directory/file): There is a directory with name pkg/kamailio/debian-lenny in HEAD. Adding pkg/kamailio/debian-lenny as pkg/kamailio/debian-lenny~3224810f6fc75b0f7a498e8bfe3947c0e05bc98f Removing pkg/kamailio/debian-lenny/changelog Removing pkg/kamailio/debian-lenny/rules Automatic merge failed; fix conflicts and then commit the result.
I don't know what eg does, but (after making a quick backup of the tree), try the following:
# revert to the state before the pull/merge # (warning: any not comited changes ??will be permanently lost, that's # the main reason for the backup) git reset --hard ORIG_HEAD # if everything is ok (your commit should be ontop) # rebase on top of the repository version of kamailio_3.0 git rebase origin/kamailio_3.0 # push your changes back git push origin kamailio_3.0:kamilio_3.0
If you still got errors, try again git reset --hard ORIG_HEAD, ??delete pkg/kamailio/debian-lenny and then continue with the rebase.
If it still doesn't work, reset --hard ORIG_HEAD again, and send me the output of: git log ^HEAD origin/kamailio_3.0 git log HEAD ^origin/kamailio_3.0 git diff git diff --cached git status
Andrei
sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Andrei Pelinescu-Onciul writes:
So far the only problem was the missing info/allowed-users. I md5'ed all the other hooks and they are the original version.
The repository data looks ok so far. I don't think Juha's pull conflict is related to it.
i just gave up and deleted whole sip-router git directory. then i did
git clone --depth 1 git://git.sip-router.org/sip-router sip-router git checkout -b kamailio_3.0 origin/kamailio_3.0
and when i then try to cherry pick the commit i earlier today did on master, it fails like this:
$ eg cherry-pick 976fb426bb577fab033e7846625fbfa2a8a38399 Automatic cherry-pick failed. After resolving the conflicts, mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result with:
git commit -c 976fb426bb577fab033e7846625fbfa2a8a38399
-- juha
On Jun 09, 2010 at 18:50, Juha Heinanen jh@tutpro.com wrote:
Andrei Pelinescu-Onciul writes:
So far the only problem was the missing info/allowed-users. I md5'ed all the other hooks and they are the original version.
The repository data looks ok so far. I don't think Juha's pull conflict is related to it.
i just gave up and deleted whole sip-router git directory. then i did
git clone --depth 1 git://git.sip-router.org/sip-router sip-router git checkout -b kamailio_3.0 origin/kamailio_3.0
and when i then try to cherry pick the commit i earlier today did on master, it fails like this:
$ eg cherry-pick 976fb426bb577fab033e7846625fbfa2a8a38399 Automatic cherry-pick failed. After resolving the conflicts, mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result with:
git commit -c 976fb426bb577fab033e7846625fbfa2a8a38399
It looks to me like a normal conflict: the versions in kamailio_3.0 and master are just too different and so cherry-pick-ing doesn't work. If you look in the file given by git status (modules/mediaproxy/mediaproxy.c) and search for conflict markers ("<<<<", ">>>>", "====="), you'll see the conflicts:
<<<<<<< HEAD ||||||| parent of 976fb42... modules/mediaproxy: ICE fixes Bool has_ice; ======= Bool has_ice; Bool has_rtcp_ice;
> 976fb42... modules/mediaproxy: ICE fixes
Which that the k_3.0 version did not have any has_ice (nothing between <<<< and ||||), the original ancestor of the cherry picked master commit had it (between |||| and ====) and the new version that you try to cherry pick has both "has_ice" and "has_rtp_ice".
There are several conflicts. To me it looks the kamailio 3.0 version is quite old compared to the master one and you are trying to apply a commit which is too new. I think you have to cherry-pick more:
$ git log --oneline --left-right --cherry-pick master...origin/kamailio_3.0 modules/mediaproxy/*.[ch] <976fb42 modules/mediaproxy: ICE fixes - ICE attributes may appear at the sessio <635ac30 modules/mediaproxy: some minor bug fixes and code cleanups <1dd0a33 modules/mediaproxy: Added support for ICE negotiation.
Note that if you try to cherry-pick 1dd0a33 and 635ac30 you will still get some conflicts in pkg/kamailio/debian-lenny. The problem is that the directory was changed into a symbolic link with the same name and that's one of the things that confuses git (in general one should avoid deleting a file and creating a directory or symlink with the same name or vice-versa).
To solve this, every time you get a conflict on pkg/kamailio/debian-lenny, run git reset pkg/kamailio/debian-lenny and then continue with git commit -c ....
Using the above "method" I was able to cherry pick all the commits for mediaproxy. Here's are the exact commands:
git cherry-pick -x 1dd0a33 git reset -- pkg/kamailio/debian-lenny git commit -c 1dd0a33 git cherry-pick -x 635ac30 git reset -- pkg/kamailio/debian-lenny git commit -c 635ac30 git cherry-pick -x 976fb42
The result compiles, but since I don't use or know anything about recent mediaproxy, someone else should review if these cherry-picks are ok for 3.0
Andrei
Andrei Pelinescu-Onciul writes:
The result compiles, but since I don't use or know anything about recent mediaproxy, someone else should review if these cherry-picks are ok for 3.0
andrei,
my bad. i forgot that recent changes to mediaproxy module have only been committed to master. it can be that way.
-- juha
-
Andrei Pelinescu-Onciul -
Jan Janak -
Juha Heinanen