[llvm-commits] [llvm] r48822 - in /llvm/trunk: include/llvm/CodeGen/ScheduleDAG.h include/llvm/CodeGen/SelectionDAGNodes.h lib/CodeGen/SelectionDAG/DAGCombiner.cpp lib/CodeGen/SelectionDAG/LegalizeDAG.cpp lib/CodeGen/SelectionDAG/LegalizeTypes.cp

[Duncan Sands]

Hi,

> I have a stupid question regarding this. My source tree is newer than
> that revision and some other unrelated things are changed in the
> affected files already. Therefore I cannot so simply commit the fix.
> How can I do that? Probably I can edit the backed-out patch, but how
> do I commit this patch file  to the SVN? Is it possible to commit the
> file containing a patch, i.e. without SVN analyzing the source files
> on my side?

do
	svn update
This will auto-merge in the upstream changes.  If there is a conflict
you will see letter C and will need to fix up the conflict by hand-editing
(the conflicted parts are marked with <<<< etc in the file).  Once you
have fixed up the conflict, you can do
	svn resolved file_name
If everything seems fine, you can do
	svn commit

The basic rule is that you can't commit unless you have the latest version
of the file; using svn update makes sure you have the latest version.

Ciao,

Duncan.