The goal is back port the patches to denzil branch from master 1)git://git.openembedded.org/openembedded-core 2)git checkout -b denizl origin/denizl 3)get the commit list in branch master but not in the denzil (to format patches then apply to denzil branch_ [lyang0@ala-lpggp2 openembedded-core]$ git rev-list ^denzil master meta/recipes-devtools/binutils 81ecc9d468c36b36c4b2ccc4ab5f366611a8fa46 f4ed063e32f064e996a4c29760fa4ac49f1ed73c 7b1caeca8e5c0dd066bb940fe6d2dff4d22bf816 f0ad3c8ce298ca492938e4ded2263c54213786f6 29916bfbbea3bb785e8e4d332848b19ebc0a3ea9 99f859612e16d636702f9bb11825259d90e468f2 447d77b9e33a68f748c96a152eae19148e43ed7c
and then I can format above commit id with "git format-patch" to get patches but when I patch with the patches I find it patch failed due to commit "447d77b9e33a68f748c96a152eae19148e43ed7c" content has been in the denizl branch even denzil has no commit"447d77b9e33a68f748c96a152eae19148e43ed7c" ,I find the root casues is denizl has the commit "15c8ea4d35edbcaf03c94aba06ded85851679157" which is the same as "447d77b9e33a68f748c96a152eae19148e43ed7c" in master branch My quesion is how could I get the commit list that has not the duplicated content Thanks Lei On 7/7/12, Thomas Ferris Nicolaisen <tfn...@gmail.com> wrote: > On Saturday, July 7, 2012 3:52:05 PM UTC+2, lei yang wrote: >> >> 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 >> > > Hi, > > I'm afraid I still don't understand your problem. > > Please explain, at a higher/abstract level what you are trying to achieve > here. Perhaps someone has ideas for an approach that would be better. > > Then tell us exactly which git commands you are using, what output they > produce, what you were expecting and if possible an example repository > where we can recreate the problem. If not, describe the repositories, the > branches and their configuration as clearly as possible. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To view this discussion on the web visit > https://groups.google.com/d/msg/git-users/-/sDS57UffeRMJ. > 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. > > -- 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.
