Module: sip-router Branch: carstenbock/rtpproxy Commit: 5415f157c5b561b03a1be5bfe5f96d68f2bb1838 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5415f157...
Author: Carsten Bock lists@bock.info Committer: Carsten Bock lists@bock.info Date: Mon Aug 30 16:26:05 2010 +0200
Merge branch 'master' into rtpproxy
* master: (29 commits) modules/db_berkeley Added a compatibility layer between libdb versions smaller than 4.6 and libdb4.6 xhttp: don't set version to http/1.0 tcp: read http/1.1 chunked body xcap_server: etag column is of type str pv(k): don't use CL for body PV textops(k): declare variables at function start registrar(k): declare variables at function start dialog(k): declare variables at function start mediaproxy: declare variables at function start mtree: declare variables at function start core: don't use conditionals in macro arguments core: pointer aliasing warning fixes for fix_rval_expr core: use const in some ip_addr functions core: use const char*/str* for hash functions core: typo fix in dns_cache_clone_entry() tm: warnings and avp param init. fixes nat_traversal(k): register stats only ifdef STATISTICS sst(k): don't register statistics twice nathelper(k): add missing mi.h include modules_k/nathelper: better add_contact_alias/handle_ruri_alias fix ...
---
On Aug 30, 2010 at 17:14, Carsten Bock carsten@bock.info wrote:
Module: sip-router Branch: carstenbock/rtpproxy Commit: 5415f157c5b561b03a1be5bfe5f96d68f2bb1838 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5415f157...
Author: Carsten Bock lists@bock.info Committer: Carsten Bock lists@bock.info Date: Mon Aug 30 16:26:05 2010 +0200
Merge branch 'master' into rtpproxy
In the future please avoid merging master into your branch, unless absolutely necessary (e.g. you depend on some changes made on master). It will create confusing log messages later when/if will be merged into master.
Andrei
Hi Andrei,
ok, i will do.
Carsten
2010/8/31 Andrei Pelinescu-Onciul andrei@iptel.org:
On Aug 30, 2010 at 17:14, Carsten Bock carsten@bock.info wrote:
Module: sip-router Branch: carstenbock/rtpproxy Commit: 5415f157c5b561b03a1be5bfe5f96d68f2bb1838 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5415f157...
Author: Carsten Bock lists@bock.info Committer: Carsten Bock lists@bock.info Date: Mon Aug 30 16:26:05 2010 +0200
Merge branch 'master' into rtpproxy
In the future please avoid merging master into your branch, unless absolutely necessary (e.g. you depend on some changes made on master). It will create confusing log messages later when/if will be merged into master.
Andrei
sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
On Aug 31, 2010 at 08:59, Carsten Bock lists@bock.info wrote:
Hi Andrei,
ok, i will do.
Actually it is not too late. You can still filter out the unneeded commits before the merge.
For that you need to create a new branch.
Example (tested):
git checkout -b rtpproxy_cleanup origin/carstenbock/rtpproxy
# no you need to git rebase -i, but first you need to see which commits # to keep. For that use (1): git log --oneline ^master origin/carstenbock/rtpproxy # this will show all the commits that are unique to your branch (not # present in master). # To see which is the commit from where you branched, take the last # commit above and look at its parent (either by means of git log, # git show or git rev-parse) git rev-parse ac84acd~1 => 96e1bc629bc7ed78dd64b221bc54b266cd45e3ca
# now rebase it: git rebase -i 96e1bc6 # (you'll get an editor and a commit list and you should delete all # lines with commits that don't appear in the list (1) # (git log --oneline ^master origin/carstenbock/rtpproxy)
# now check it with git log to see if it looks ok, push it with a # new name to the repo and merge it into master: git push origin HEAD:carstenbock/rtpproxy2 git checkout master git merge --log origin/carstenbock/rtpproxy2$ git push origin master:master
Alternatively you could use git cherry-pick and pick only the commits in the list instead of using git rebase -i.
I could also push the cleaned version for you, if you don't want to go through the above exercise.
Andrei
2010/8/31 Andrei Pelinescu-Onciul andrei@iptel.org:
On Aug 30, 2010 at 17:14, Carsten Bock carsten@bock.info wrote:
Module: sip-router Branch: carstenbock/rtpproxy Commit: 5415f157c5b561b03a1be5bfe5f96d68f2bb1838 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5415f157...
Author: Carsten Bock lists@bock.info Committer: Carsten Bock lists@bock.info Date: Mon Aug 30 16:26:05 2010 +0200
Merge branch 'master' into rtpproxy
In the future please avoid merging master into your branch, unless absolutely necessary (e.g. you depend on some changes made on master). It will create confusing log messages later when/if will be merged into master.
Andrei
sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Hi Andrei,
I've done it myself, it was a good practice for using Git....
Carsten
2010/8/31 Andrei Pelinescu-Onciul andrei@iptel.org:
On Aug 31, 2010 at 08:59, Carsten Bock lists@bock.info wrote:
Hi Andrei,
ok, i will do.
Actually it is not too late. You can still filter out the unneeded commits before the merge.
For that you need to create a new branch.
Example (tested):
git checkout -b rtpproxy_cleanup origin/carstenbock/rtpproxy
# no you need to git rebase -i, but first you need to see which commits # to keep. For that use (1): git log --oneline ^master origin/carstenbock/rtpproxy # this will show all the commits that are unique to your branch (not # present in master). # To see which is the commit from where you branched, take the last # commit above and look at its parent (either by means of git log, # git show or git rev-parse) git rev-parse ac84acd~1 => 96e1bc629bc7ed78dd64b221bc54b266cd45e3ca
# now rebase it: git rebase -i 96e1bc6 # (you'll get an editor and a commit list and you should delete all # lines with commits that don't appear in the list (1) # (git log --oneline ^master origin/carstenbock/rtpproxy)
# now check it with git log to see if it looks ok, push it with a # new name to the repo and merge it into master: git push origin HEAD:carstenbock/rtpproxy2 git checkout master git merge --log origin/carstenbock/rtpproxy2$ git push origin master:master
Alternatively you could use git cherry-pick and pick only the commits in the list instead of using git rebase -i.
I could also push the cleaned version for you, if you don't want to go through the above exercise.
Andrei
2010/8/31 Andrei Pelinescu-Onciul andrei@iptel.org:
On Aug 30, 2010 at 17:14, Carsten Bock carsten@bock.info wrote:
Module: sip-router Branch: carstenbock/rtpproxy Commit: 5415f157c5b561b03a1be5bfe5f96d68f2bb1838 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5415f157...
Author: Carsten Bock lists@bock.info Committer: Carsten Bock lists@bock.info Date: Mon Aug 30 16:26:05 2010 +0200
Merge branch 'master' into rtpproxy
In the future please avoid merging master into your branch, unless absolutely necessary (e.g. you depend on some changes made on master). It will create confusing log messages later when/if will be merged into master.
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 -
Carsten Bock -
Carsten Bock