[Freeswitch-users] 'make current' fails to complete

[curriegrad2004]

Yeah, the next time you make changes to the git tree, you would want
to first stash all your changes by running git stash and then do the
git pull. After that, run git stash apply to restore the changes you
made to the code on the git tree.

On Wed, Jun 22, 2011 at 12:48 PM, elijah <elijah at crankenstein.com> wrote:
> I did make changes. 'git reset --hard' worked. Thanks.
>
> On Tue, Jun 21, 2011 at 6:11 PM, curriegrad2004 <curriegrad2004 at gmail.com>
> wrote:
>>
>> did you make any changes to the code tree? If you did, you'd probably
>> want to perform a git stash to save all the changes you made then run
>> git stash apply to merge your changes after the pull.
>>
>> Otherwise, it would be wise to run git reset --hard to 'fix' the
>> source tree if you are sure you made no changes to the code at all
>>
>> On Tue, Jun 21, 2011 at 5:44 PM, elijah <elijah at crankenstein.com> wrote:
>> > My attempts to 'make current' against the Git repository are failing
>> > today.
>> > Can you recommend a method by which I can update my FreeSwitch
>> > installation?
>> > Here's the the last bit of console logging:
>> > ...
>> > make[2]: Leaving directory `/usr/src/freeswitch/libs/esl/ruby'
>> > make -C java clean
>> > make[2]: Entering directory `/usr/src/freeswitch/libs/esl/java'
>> > rm -f *.o *.so *~ *.jar
>> > make[2]: Leaving directory `/usr/src/freeswitch/libs/esl/java'
>> > make -C managed clean
>> > make[2]: Entering directory `/usr/src/freeswitch/libs/esl/managed'
>> > rm -f *.o *.so *~
>> > make[2]: Leaving directory `/usr/src/freeswitch/libs/esl/managed'
>> > make[1]: Leaving directory `/usr/src/freeswitch/libs/esl'
>> > make update
>> > make[1]: Entering directory `/usr/src/freeswitch'
>> > Pulling updates...
>> > Updating 5923f71..4bb7683
>> > src/mod/applications/mod_dptools/mod_dptools.c: needs update
>> > fatal: Entry 'src/mod/applications/mod_dptools/mod_dptools.c' not
>> > uptodate.
>> > Cannot merge.
>> > make[1]: *** [update] Error 128
>> > make[1]: Leaving directory `/usr/src/freeswitch'
>> > make: *** [current] Error 2
>> >
>> > _______________________________________________
>> > Join us at ClueCon 2011, Aug 9-11, Chicago
>> > http://www.cluecon.com 877-7-4ACLUE
>> >
>> > FreeSWITCH-users mailing list
>> > FreeSWITCH-users at lists.freeswitch.org
>> > http://lists.freeswitch.org/mailman/listinfo/freeswitch-users
>> > UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users
>> > http://www.freeswitch.org
>> >
>> >
>>
>> _______________________________________________
>> Join us at ClueCon 2011, Aug 9-11, Chicago
>> http://www.cluecon.com 877-7-4ACLUE
>>
>> FreeSWITCH-users mailing list
>> FreeSWITCH-users at lists.freeswitch.org
>> http://lists.freeswitch.org/mailman/listinfo/freeswitch-users
>> UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users
>> http://www.freeswitch.org
>
>
> _______________________________________________
> Join us at ClueCon 2011, Aug 9-11, Chicago
> http://www.cluecon.com 877-7-4ACLUE
>
> FreeSWITCH-users mailing list
> FreeSWITCH-users at lists.freeswitch.org
> http://lists.freeswitch.org/mailman/listinfo/freeswitch-users
> UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users
> http://www.freeswitch.org
>
>