|
| From: | Ferit Bilgin |
| Subject: | [Linphone-developers] Re: Linphone-developers Digest, Vol 95, Issue 4 |
| Date: | Wed, 5 Jan 2011 23:51:57 +0200 |
Send Linphone-developers mailing list submissions to
address@hidden
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.nongnu.org/mailman/listinfo/linphone-developers
or, via email, send a message with subject or body 'help' to
address@hidden
You can reach the person managing the list at
address@hidden
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linphone-developers digest..."
Today's Topics:
1. Re: Linphone-iphone Rebase problem... (Jehan Monnier)
2. Re: Linphone-developers Digest, Vol 94, Issue 21 (Ferit Bilgin)
----------------------------------------------------------------------
Message: 1
Date: Tue, 4 Jan 2011 19:12:54 +0100
From: Jehan Monnier <address@hidden>
Subject: Re: [Linphone-developers] Linphone-iphone Rebase problem...
To: address@hidden
Message-ID: <address@hidden>
Content-Type: text/plain; charset="iso-8859-1"
Hi,
Usual process for updating is:
git pull origin master
git submodule update --recursive --init
cheers
Jehan
www.linphone.org
Le 31 déc. 2010 à 14:33, Ferit Bilgin a écrit :
> Hi all,
>
> I want to ask about the rebase operation in git. I am not familiar with git and the documents I found from internet are including several stuff with several options and I cant make sure which one to use.
>
> Here is what I tried before writing to this list:
>
> I tried to run rebase command but it keeps saying that the stream is up to date (I tried both remotes/origin/master and master itself). But I can see the updates from the version tree of the main branch.
> I tried to run pull method in linphone-iphone folder which worked fine for that project but when it came to build, xcode was giving an error and saying that it cannot find some references. This is probably because the inner projects and externals are not updated. I don't know if there is a way to pull everything recursively but I couldn't find a working method. I tried to set options, -s, -x, etc.
> I went through all the inner projects and tried to pull their changes manually but this made things even more complex. I also had some conflicts in some classes that I even didn't touch (maybe linphone-iphone developers had done some fixes there and this is the reason for the conflict). I resolved the conflicts but still cannot build successfully.
>
> When we making a clone operation, we also provide a --recursive parameter which I believe downloads inner projects from the repositories. But I cannot do the same for rebase, pull, etc.
>
> What is the common way of getting updates done in the main branch?
>
> Thanks..
> _______________________________________________
> Linphone-developers mailing list
> address@hidden
> http://lists.nongnu.org/mailman/listinfo/linphone-developers
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.nongnu.org/archive/html/linphone-developers/attachments/20110104/17e52cfb/attachment.html
------------------------------
Message: 2
Date: Tue, 4 Jan 2011 22:05:18 +0200
From: Ferit Bilgin <address@hidden>
Subject: [Linphone-developers] Re: Linphone-developers Digest, Vol 94,
Issue 21
To: address@hidden
Message-ID:
<AANLkTi=S5w5yi-WLZx4faBxdWLZ=address@hidden>
Content-Type: text/plain; charset="utf-8"
>
> Any idea about this question?
>
> Message: 2
> Date: Fri, 31 Dec 2010 15:33:02 +0200
> From: Ferit Bilgin <address@hidden>
> Subject: [Linphone-developers] Linphone-iphone Rebase problem...
> To: address@hidden
> Message-ID:
> <AANLkTiks3wEkgST_mEEGgjnbdazvt=address@hidden<address@hidden>
> >
> Content-Type: text/plain; charset="utf-8"
>
> Hi all,
>
> I want to ask about the rebase operation in git. I am not familiar with git
> and the documents I found from internet are including several stuff with
> several options and I cant make sure which one to use.
>
> Here is what I tried before writing to this list:
>
> I tried to run rebase command but it keeps saying that the stream is up to
> date (I tried both remotes/origin/master and master itself). But I can see
> the updates from the version tree of the main branch.
> I tried to run pull method in linphone-iphone folder which worked fine for
> that project but when it came to build, xcode was giving an error and
> saying that it cannot find some references. This is probably because the
> inner projects and externals are not updated. I don't know if there is a
> way
> to pull everything recursively but I couldn't find a working method. I
> tried
> to set options, -s, -x, etc.
> I went through all the inner projects and tried to pull their changes
> manually but this made things even more complex. I also had some conflicts
> in some classes that I even didn't touch (maybe linphone-iphone developers
> had done some fixes there and this is the reason for the conflict). I
> resolved the conflicts but still cannot build successfully.
>
> When we making a clone operation, we also provide a --recursive parameter
> which I believe downloads inner projects from the repositories. But I
> cannot
> do the same for rebase, pull, etc.
>
> What is the common way of getting updates done in the main branch?
>
> Thanks..
> -------------- next part --------------
> An HTML attachment was scrubbed...
> URL:
> http://lists.nongnu.org/archive/html/linphone-developers/attachments/20101231/99d6f317/attachment.html
>
> ------------------------------
>
> _______________________________________________
> Linphone-developers mailing list
> address@hidden
> http://lists.nongnu.org/mailman/listinfo/linphone-developers
>
>
> End of Linphone-developers Digest, Vol 94, Issue 21
> ***************************************************
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.nongnu.org/archive/html/linphone-developers/attachments/20110104/93f4d8a1/attachment.html
------------------------------
_______________________________________________
Linphone-developers mailing list
address@hidden
http://lists.nongnu.org/mailman/listinfo/linphone-developers
End of Linphone-developers Digest, Vol 95, Issue 4
**************************************************
| [Prev in Thread] | Current Thread | [Next in Thread] |