[rtems-libbsd commit] Merge branch 'master' of ssh://git.rtems.org/data/git /rtems-libbsd

[Gedare Bloom]

On Thu, Sep 6, 2012 at 11:49 AM, Joel Sherrill
<joel.sherrill at oarcorp.com> wrote:
> Is all it takes to get this doing a push which gets rejected because
> you forgot to pull to get up to date first?
>
> Is there a "reset" step I am completely unaware of when this
> happens?
>
> ===> Push attempt rejected
>
> [joel at iceland rtems-libbsd]$ git push
> To ssh://joel@git.rtems.org/data/git/rtems-libbsd.git
>  ! [rejected]        master -> master (non-fast-forward)
> error: failed to push some refs to
> 'ssh://joel@git.rtems.org/data/git/rtems-libbsd.git'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes before pushing again.  See the 'Note about
> fast-forwards' section of 'git push --help' for details.
>
> ===> Then a pull attempt
>
> [joel at iceland rtems-libbsd]$ git pull
> remote: Counting objects: 26, done.
> remote: Compressing objects: 100% (15/15), done.
> remote: Total 17 (delta 5), reused 0 (delta 0)
> Unpacking objects: 100% (17/17), done.
> From ssh://git.rtems.org/data/git/rtems-libbsd
>    6d7f488..bd2941b  master     -> origin/master
> error: Your local changes to 'freebsd-userspace/Makefile' would be
> overwritten by merge.  Aborting.
> Please, commit your changes or stash them before you can merge.
>
> ===> OK.. stashing my local changes
>
> [joel at iceland rtems-libbsd]$ git stash
> Saved working directory and index state WIP on master: 7b1b5b8 Revert
> patches moving include of port_local.h to top of file
> HEAD is now at 7b1b5b8 Revert patches moving include of port_local.h to top
> of file
>
This stashed uncommited changes. If you made git commit's that
conflict with upstream then a git pull is going to do a merge.

> ===> Then a successful pull
>
> [joel at iceland rtems-libbsd]$ git pull
> Merge made by recursive.
This is where the merge commit was generated. Use git pull --rebase to
avoid merging (if you are merging patches that are not "public The
rebase will undo your commits, apply the git pull, then redo your
commits.

>  .gitignore                                     |    1 +
>  freebsd-userspace/Makefile                     |   15 +-
>  freebsd-userspace/commands/sbin/route/keywords |   55 +
>  freebsd-userspace/commands/sbin/route/route.8  |  411 ++++++
>  freebsd-userspace/commands/sbin/route/route.c  | 1681
> ++++++++++++++++++++++++
>  freebsd-userspace/from-freebsd.sh              |    2 +
>  freebsd-userspace/include/netatalk/at.h        |    2 +
>  freebsd-userspace/include/netinet/if_ether.h   |    2 +
>  8 files changed, 2168 insertions(+), 1 deletions(-)
>  create mode 100644 freebsd-userspace/commands/sbin/route/keywords
>  create mode 100644 freebsd-userspace/commands/sbin/route/route.8
>  create mode 100644 freebsd-userspace/commands/sbin/route/route.c
>  create mode 100644 freebsd-userspace/include/netatalk/at.h
>  create mode 100644 freebsd-userspace/include/netinet/if_ether.h
>
> ===> Finally the push I tried initially works
>
> [joel at iceland rtems-libbsd]$ git push
> Counting objects: 74, done.
> Delta compression using up to 2 threads.
> Compressing objects: 100% (33/33), done.
> Writing objects: 100% (39/39), 7.01 KiB, done.
> Total 39 (delta 28), reused 5 (delta 3)
> remote: 1: mail rtems-vc at rtems.org
> remote: 2: update github
> To ssh://joel@git.rtems.org/data/git/rtems-libbsd.git
>    bd2941b..9dd5921  master -> master
>
>
>
>
> On 09/06/2012 10:32 AM, Joel Sherrill wrote:
>>
>> Module:    rtems-libbsd
>> Branch:    master
>> Commit:    9dd59215ce0de247fadd2ad186e4050500943b4f
>> Changeset:
>> http://git.rtems.org/rtems-libbsd/commit/?id=9dd59215ce0de247fadd2ad186e4050500943b4f
>>
>> Author:    Joel Sherrill<joel.sherrill at oarcorp.com>
>> Date:      Thu Sep  6 10:36:47 2012 -0500
>>
>> Merge branch 'master' of ssh://git.rtems.org/data/git/rtems-libbsd
>>
>> ---
>>
>>
>>
>> _______________________________________________
>> rtems-vc mailing list
>> rtems-vc at rtems.org
>> http://www.rtems.org/mailman/listinfo/rtems-vc
>
>
>
> --
> Joel Sherrill, Ph.D.             Director of Research&   Development
> joel.sherrill at OARcorp.com        On-Line Applications Research
> Ask me about RTEMS: a free RTOS  Huntsville AL 35805
>     Support Available             (256) 722-9985
>
>
> _______________________________________________
> rtems-devel mailing list
> rtems-devel at rtems.org
> http://www.rtems.org/mailman/listinfo/rtems-devel