[valgrind-variant] r128 committed - Edited wiki page HowTo through web user interface.

[valgrind...@googlecode.com]

Revision: 128
Author: sams...@google.com
Date: Mon Dec 12 03:01:51 2011
Log: Edited wiki page HowTo through web user interface.
http://code.google.com/p/valgrind-variant/source/detail?r=128

Modified:
/wiki/HowTo.wiki

=======================================
--- /wiki/HowTo.wiki Thu Feb 10 03:54:33 2011
+++ /wiki/HowTo.wiki Mon Dec 12 03:01:51 2011
@@ -20,9 +20,17 @@
svn diff $VG_VARIANT/branches/valgrind_orig/valgrind
$VG_VARIANT/trunk/valgrind
}}}

-=How to make a diff between two given revisions of official valgrind =
-You need to create two diff files: one for valgrind and one for VEX.
-The script
[http://valgrind-variant.googlecode.com/svn/trunk/scripts/mk_patch.sh
scripts/mk_patch.sh] will do the work for you:
+=How to merge valgrind-variant with official valgrind =
+ # Learn the latest revisions of valgrind and VEX that were merged into
valgrind-variant [http://code.google.com/p/valgrind-variant/source/list
here].
+ # Create two diff files between revisions of official valgrind and VEX.
The script
[http://valgrind-variant.googlecode.com/svn/trunk/scripts/mk_patch.sh
scripts/mk_patch.sh] will do the work for you:
{{{
./scripts/mk_patch.sh VG_OLD_REV VEX_OLD_REV VG_NEW_REV VEX_NEW_REV
}}}
+ # Apply the patches:
+{{{
+(cd valgrind && patch -p0 -E <VG_PATCH_NAME)
+(cd valgrind/VEX && patch -p0 -E <VEX_PATCH_NAME)
+}}}
+ # Check merged files, resolve all conflicts and remove `*.orig` and
`*.rej` files, if necessary.
+ # Run `"svn add"` for new files and `"svn remove"` for deleted ones, if
necessary.
+ # Build and test merged version.