xorg-server-1.8.99.904 tag
Peter Harris
pharris at opentext.com
Tue Jul 13 11:03:58 PDT 2010
On 2010-07-13 12:24, Jeremy Huddleston wrote:
>
> 0001 corresponds to commit 1884db430a5680e37e94726dff46686e2218d525
>
> and doesn't apply to the clean 1.8.99.904 tarball:
It looks like Peter and Keith both independently picked up that patch.
Keith's 018c878e is part of the tag, but Peter's wasn't merged until
69b2b5c "Merge remote branch 'whot/for-keith'.
> Reversed (or previously applied) patch detected! Assume -R? [n]
> Apply anyway? [n]
>
> Was the tag applied to the wrong commit, or am I missing something
> here?
Just that the patch really was previously applied, since it's in git
twice (once before the tag, and once after).
git-format-patch --ignore-if-in-upstream looks like it ought to help,
but it only appears to work if the two end-points haven't already been
merged. Hmm.
Peter Harris
--
Open Text Connectivity Solutions Group
Peter Harris http://connectivity.opentext.com/
Research and Development Phone: +1 905 762 6001
pharris at opentext.com Toll Free: 1 877 359 4866
More information about the xorg-devel
mailing list