Hi expert,

I often get the commit in the branch "upmaster" but not in the
"local_branch" for one dir named meta/recipes-core/eglibc with below
cmd

git rev-list ^local_branch upmaster meta/recipes-core/eglibc

and then get the commit list. and then format the commit with patches
and then patch to "local_branch"

But, today I find some commit even in the branch "upmaster" not in
then "local_branch"  but with this commit formated patches patch to
"local_branch" failed

eg:
in the "upmaster" it has the commit 447d77b9e33a68f748c96a152eae19148e43ed7c
not in the branch "local_branch" (this get from above cmd)

upmaster's branch:
commit 447d77b9e33a68f748c96a152eae19148e43ed7c
Author: Saul Wold <s...@linux.intel.com>
Date:   Thu Apr 19 11:01:15 2012 -0700

    binutils: add embedspu for ppc builds

    WARNING: For recipe binutils, the following files/directories were
installed but not shipped in any package:
    WARNING:   /usr/bin/embedspu
    Signed-off-by: Saul Wold <s...@linux.intel.com>

how ever when I format this commit with patches it pacth failed to
local_branch, the reson is local branch has patched with this commit's
changes but with another commit id

loca_branch:
commit 15c8ea4d35edbcaf03c94aba06ded85851679157
Author: Saul Wold <s...@linux.intel.com>
Date:   Thu Apr 19 11:01:15 2012 -0700

    binutils: add embedspu for ppc builds

    WARNING: For recipe binutils, the following files/directories were
installed but not shipped in any package:
    WARNING:   /usr/bin/embedspu
    Signed-off-by: Saul Wold <s...@linux.intel.com>

they have the same content but different commit id

how chould I avoid this duplicate patches ( to get a list not duplicate)

Lei

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to