trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: June 2012

Re: [trinity-devel] FTBFS tqca-tls (x86_64) can't find TQt3 (i686 builds?)

From: Nix <nix@...>
Date: Mon, 25 Jun 2012 16:16:51 +0100
On 24 Jun 2012, Darrell Anderson said:

>> "How do I go about reverting specific commits in the build files?"
>
> Use the --reverse parameter, like this:

Or use 'git revert', or 'git revert --no-commit' if you prefer not to
commit it automatically.

> cat a5dfd481.diff | patch -p1 --reverse --verbose --no-backup-if-mismatch || exit 1

This is unreliable: git diffs are a superset of the format accepted by
GNU patch (and some of the extensions can lead to *different output*
with certain older versions of patch, not a failed patch application).
If you want to apply git diffs by hand like patch does, use 'git apply'.

-- 
NULL && (void)