discarding commits

1,607 views
Skip to first unread message

Gary.Sc...@bench.com

unread,
Sep 9, 2009, 3:13:43 PM9/9/09
to repo-d...@googlegroups.com


I am changing/building Android code (integrated with GStreamer) for the BeagleBoard and have run into a problem.  I have modified a number of files and wanted to commit my changes and create a local branch where I could do some driver work, leaving my main repository working and intact.  When I completed my commits, I did a "repo sync" to make sure that I was current with the projects and some of my commits were discarded (git log now doesn't show any history of my changes)?  Does anybody know what I did wrong (I am new to git and repo)?

omap3droid$ repo sync
Fetching projects: 100% (135/135), done. 
Syncing work tree: 100% (133/133), done. 

build/: discarding 1 commits
dalvik/: discarding 2 commits
kernel/: discarding 6 commits
packages/apps/Calendar/: discarding 1 commits
packages/apps/Contacts/: discarding 2 commits
packages/apps/Mms/: discarding 1 commits
packages/apps/Music/: discarding 1 commits
packages/apps/Phone/: discarding 1 commits
vendor/embinux/support-tools/: discarding 1 commits

omap3droid$ repo --version
repo version v1.6.8.7
       (from git://android.git.kernel.org/tools/repo.git)
git version 1.5.6.3
Python 2.5.2 (r252:60911, Oct  5 2008, 19:24:49)
[GCC 4.3.2]


Brad Larson

unread,
Sep 9, 2009, 4:48:13 PM9/9/09
to Repo and Gerrit Discussion
I suspect you didn't start your local branches with 'repo start'.
That would probably fix the problem.

Your changes are still around. cd to each directory and 'git checkout
$BRANCHNAME'.

Brad

schumgl

unread,
Sep 10, 2009, 12:08:47 PM9/10/09
to Repo and Gerrit Discussion
Thanks for the info.

After further reading I found the source of my confusion was in the
description of the commit command. I only added files that were new
NOT the ones that I had modified.
> > [GCC 4.3.2]- Hide quoted text -
>
> - Show quoted text -
Reply all
Reply to author
Forward
0 new messages