Akcije
Podrška #14355
Zatvoren
git repos asterisk, bristuff
Status:
Zastarjelo
Prioritet:
Normalan
Odgovorna osoba:
-
Kategorija:
-
Početak:
25.05.2008
Završetak:
% završeno:
0%
Procjena vremena:
Opis
- pokupio sa git-svn kompletan asterisk dir
uzeti iz bristuff patch:
root@stor-34:/data/hg/asterisk/asterisk# hg diff -r 1.4.19.1 -r 1.4.19.1-bristuff > ../1.4.19.1_bristuff.diff
Povezani tiketi 1 (0 otvoreno — 1 zatvoren)
Izmjenjeno od Ernad Husremović prije više od 16 godina
zaptel svn:
hernad@nmraka-1:/data/home/hernad/devel/git/redmine-1.bring.out.ba$ git-svn clone http://svn.digium.com/svn/zaptel -T trunk -t tags -b branches
Izmjenjeno od Ernad Husremović prije više od 16 godina
libpri :
hernad@nmraka-1:~/devel/git/redmine-1.bring.out.ba$ git-svn clone http://svn.digium.com/svn/libpri -T trunk -t tags -b branches
Izmjenjeno od Ernad Husremović prije više od 16 godina
asterisk-addons:
hernad@nmraka-1:/data/home/hernad/devel/git/redmine-1.bring.out.ba$ git-svn clone http://svn.digium.com/svn/asterisk-addons -T trunk -t tags -b branches
Izmjenjeno od Ernad Husremović prije više od 16 godina
branch bring.out.ba-bristuff-1.4.19.1¶
hernad@nmraka-1:/data/home/hernad/devel/git/redmine-1.bring.out.ba/asterisk$ git checkout tags/1.4.19.1 Switched to branch "tags/1.4.19.1" hernad@nmraka-1:/data/home/hernad/devel/git/redmine-1.bring.out.ba/asterisk$ git branch bring.out.ba-bristuff-1.4.19.1 hernad@nmraka-1:/data/home/hernad/devel/git/redmine-1.bring.out.ba/asterisk$ git checkout bring.out.ba-bristuff-1.4.19.1 Switched to branch "bring.out.ba-bristuff-1.4.19.1"
patchirao šta se patchirati može
hernad@nmraka-1:/data/home/hernad/devel/git/redmine-1.bring.out.ba/asterisk$ patch -p1 < ../1.4.19.1_bristuff.diff
can't find file to patch at input line 4 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -r 469c1f3a4169 -r 73dbb96c076c .hgtags |--- a/.hgtags Sun May 11 19:29:19 2008 +0200 |+++ b/.hgtags Sun May 11 19:42:37 2008 +0200 -------------------------- File to patch: Skip this patch? [y] y Skipping patch. 1 out of 1 hunk ignored patching file .version patching file LICENSE patching file README patching file agi/Makefile patching file agi/xagi-test.c patching file apps/app_chanspy.c patching file apps/app_devstate.c patching file apps/app_dial.c patching file apps/app_directed_pickup.c patching file apps/app_meetme.c patching file apps/app_pickup.c patching file apps/app_queue.c patching file apps/app_segfault.c patching file apps/app_zapras.c patching file build_tools/make_defaults_h can't find file to patch at input line 1347 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -r 469c1f3a4169 -r 73dbb96c076c build_tools/menuselect-deps |--- a/build_tools/menuselect-deps Sun May 11 19:29:19 2008 +0200 |+++ b/build_tools/menuselect-deps Sun May 11 19:42:37 2008 +0200 -------------------------- File to patch: Skip this patch? [y] y Skipping patch. 1 out of 1 hunk ignored patching file build_tools/menuselect-deps.in can't find file to patch at input line 1415 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -r 469c1f3a4169 -r 73dbb96c076c channels/.chan_zap.moduleinfo |--- a/channels/.chan_zap.moduleinfo Sun May 11 19:29:19 2008 +0200 |+++ b/channels/.chan_zap.moduleinfo Sun May 11 19:42:37 2008 +0200 -------------------------- File to patch: Skip this patch? [y] y Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 1424 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -r 469c1f3a4169 -r 73dbb96c076c channels/.moduleinfo |--- a/channels/.moduleinfo Sun May 11 19:29:19 2008 +0200 |+++ b/channels/.moduleinfo Sun May 11 19:42:37 2008 +0200 -------------------------- File to patch: Skip this patch? [y] y Skipping patch. 1 out of 1 hunk ignored patching file channels/chan_agent.c patching file channels/chan_iax2.c patching file channels/chan_sip.c patching file channels/chan_zap.c can't find file to patch at input line 4788 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -r 469c1f3a4169 -r 73dbb96c076c config.log |--- a/config.log Sun May 11 19:29:19 2008 +0200 |+++ b/config.log Sun May 11 19:42:37 2008 +0200 -------------------------- File to patch: Skip this patch? [y] y Skipping patch. 61 out of 61 hunks ignored can't find file to patch at input line 20655 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -r 469c1f3a4169 -r 73dbb96c076c config.status |--- a/config.status Sun May 11 19:29:19 2008 +0200 |+++ b/config.status Sun May 11 19:42:37 2008 +0200 -------------------------- File to patch: Skip this patch? [y] y Skipping patch. 18 out of 18 hunks ignored patching file configs/esel.conf.sample patching file configs/watchdog.conf.sample patching file configs/zapata.conf.sample patching file configure patching file configure.ac patching file doc/hardware.txt patching file include/asterisk/agi.h can't find file to patch at input line 21672 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -r 469c1f3a4169 -r 73dbb96c076c include/asterisk/autoconfig.h |--- a/include/asterisk/autoconfig.h Sun May 11 19:29:19 2008 +0200 |+++ b/include/asterisk/autoconfig.h Sun May 11 19:42:37 2008 +0200 -------------------------- File to patch: Skip this patch? [y] y Skipping patch. 11 out of 11 hunks ignored patching file include/asterisk/autoconfig.h.in patching file include/asterisk/channel.h patching file include/asterisk/devicestate.h patching file include/asterisk/features.h patching file include/asterisk/manager.h patching file include/asterisk/monitor.h patching file include/asterisk/pbx.h patching file main/asterisk.c patching file main/channel.c patching file main/db.c patching file main/devicestate.c patching file main/manager.c patching file main/pbx.c can't find file to patch at input line 22946 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -r 469c1f3a4169 -r 73dbb96c076c makeopts |--- a/makeopts Sun May 11 19:29:19 2008 +0200 |+++ b/makeopts Sun May 11 19:42:37 2008 +0200 -------------------------- File to patch: Skip this patch? [y] y Skipping patch. 7 out of 7 hunks ignored patching file makeopts.in can't find file to patch at input line 23067 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -r 469c1f3a4169 -r 73dbb96c076c menuselect-tree |--- a/menuselect-tree Sun May 11 19:29:19 2008 +0200 |+++ b/menuselect-tree Sun May 11 19:42:37 2008 +0200 -------------------------- File to patch: Skip this patch? [y] y Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 23078 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -r 469c1f3a4169 -r 73dbb96c076c menuselect.makedeps |--- a/menuselect.makedeps Sun May 11 19:29:19 2008 +0200 |+++ b/menuselect.makedeps Sun May 11 19:42:37 2008 +0200 -------------------------- File to patch: y y: No such file or directory Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 23090 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -r 469c1f3a4169 -r 73dbb96c076c menuselect.makeopts |--- a/menuselect.makeopts Sun May 11 19:29:19 2008 +0200 |+++ b/menuselect.makeopts Sun May 11 19:42:37 2008 +0200 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 23143 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -r 469c1f3a4169 -r 73dbb96c076c menuselect/mxml/Makefile |--- a/menuselect/mxml/Makefile Sun May 11 19:29:19 2008 +0200 |+++ b/menuselect/mxml/Makefile Sun May 11 19:42:37 2008 +0200 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored patching file pbx/pbx_spool.c patching file res/res_agi.c patching file res/res_esel.c patching file res/res_features.c patching file res/res_monitor.c patching file res/res_watchdog.c
Izmjenjeno od Ernad Husremović prije više od 16 godina
hernad@nmraka-1:/data/home/hernad/devel/git/redmine-1.bring.out.ba/asterisk$ git push b-out-ba bring.out.ba-bristuff-1.4.19.1:refs/heads/bring.out.ba-bristuff-1.4.19.1
Counting objects: 111, done. Compressing objects: 100% (59/59), done. Writing objects: 100% (60/60), 47.13 KiB, done. Total 60 (delta 50), reused 0 (delta 0) refs/heads/bring.out.ba-bristuff-1.4.19.1: 0000000000000000000000000000000000000000 -> 2746fb302c946385a0b710b9101d0c6585841189 To git@git.bring.out.ba:asterisk.git * [new branch] bring.out.ba-bristuff-1.4.19.1 -> bring.out.ba-bristuff-1.4.19.1
Izmjenjeno od Ernad Husremović prije više od 16 godina
- Naslov promijenjeno iz git repos asterisk u git repos asterisk, bristuff
konvertovao iz hg-a
hernad@nmraka-1:/data/home/hernad/devel/git/redmine-1.bring.out.ba/bristuff$ hg2git.sh -r ../bristuff_hg/
Exporting full revision 1/9 with 125/0/0 added/changed/removed files
Exporting simple delta revision 2/9 with 1/0/0 added/changed/removed files
Link new branch [bring.out.ba] to parent [:2]
Exporting simple delta revision 3/9 with 433/6/0 added/changed/removed files
Exporting simple delta revision 4/9 with 0/1/0 added/changed/removed files
Exporting simple delta revision 5/9 with 0/1/0 added/changed/removed files
Exporting simple delta revision 6/9 with 0/1/0 added/changed/removed files
Exporting simple delta revision 7/9 with 0/1/0 added/changed/removed files
Exporting simple delta revision 8/9 with 27/0/0 added/changed/removed files
Merging branch [bring.out.ba] with parent [:7] from [r5]
Exporting thorough delta revision 9/9 with 460/6/0 added/changed/removed files
Exporting tag [0.4.0-RC1] at [hg r4] [git :6]
Issued 10 commands
git-fast-import statistics:
---------------------------------------------------------------------
Alloc'd objects: 5000
Total objects: 656 ( 487 duplicates )
blobs : 575 ( 487 duplicates 322 deltas)
trees : 72 ( 0 duplicates 16 deltas)
commits: 9 ( 0 duplicates 0 deltas)
tags : 0 ( 0 duplicates 0 deltas)
Total branches: 3 ( 2 loads )
marks: 1024 ( 9 unique )
atoms: 534
Memory total: 2305 KiB
pools: 2110 KiB
objects: 195 KiB
---------------------------------------------------------------------
pack_report: getpagesize() = 4096
pack_report: core.packedGitWindowSize = 1073741824
pack_report: core.packedGitLimit = 8589934592
pack_report: pack_used_ctr = 11
pack_report: pack_mmap_calls = 7
pack_report: pack_open_windows = 1 / 1
pack_report: pack_mapped = 2278146 / 2278146
---------------------------------------------------------------------
hernad@nmraka-1:/data/home/hernad/devel/git/redmine-1.bring.out.ba/bristuff$ git branch -l
bring.out.ba default
hernad@nmraka-1:/data/home/hernad/devel/git/redmine-1.bring.out.ba/bristuff$ git-checkout -b master default
warning: You appear to be on a branch yet to be born. warning: Forcing checkout of default. Already on branch "master" hernad@nmraka-1:/data/home/hernad/devel/git/redmine-1.bring.out.ba/bristuff$ git branch -l bring.out.ba default * master
hernad@nmraka-1:/data/home/hernad/devel/git/redmine-1.bring.out.ba/bristuff$ git push b-out-ba master:refs/heads/master
Initialized empty Git repository in ./
Counting objects: 140, done. Compressing objects: 100% (79/79), done. Writing objects: 100% (140/140), 261.55 KiB, done. Total 140 (delta 53), reused 140 (delta 53) refs/heads/master: 0000000000000000000000000000000000000000 -> e14f0e09b58f69a1533e0b01d7e347751f2cefcf To git@git.bring.out.ba:asterisk_bristuff.git * [new branch] master -> master hernad@nmraka-1:/data/home/hernad/devel/git/redmine-1.bring.out.ba/bristuff$ git push b-out-ba --tags master:refs/heads/master Total 0 (delta 0), reused 0 (delta 0) refs/tags/0.4.0-RC1: 0000000000000000000000000000000000000000 -> e14f0e09b58f69a1533e0b01d7e347751f2cefcf To git@git.bring.out.ba:asterisk_bristuff.git * [new tag] 0.4.0-RC1 -> 0.4.0-RC1 hernad@nmraka-1:/data/home/hernad/devel/git/redmine-1.bring.out.ba/bristuff$ git push b-out-ba bring.out.ba:refs/heads/bring.out.ba Counting objects: 529, done. Compressing objects: 100% (212/212), done. Writing objects: 100% (517/517), 1.92 MiB | 1802 KiB/s, done. Total 517 (delta 285), reused 517 (delta 285) To git@git.bring.out.ba:asterisk_bristuff.git * [new branch] bring.out.ba -> bring.out.ba refs/heads/bring.out.ba: 0000000000000000000000000000000000000000 -> 4ae129282aa8254cd1400444a4a8fce74918c872
Izmjenjeno od Ernad Husremović prije više od 14 godina
- Status promijenjeno iz Novo u Zastarjelo
Akcije