: Do you have any recommendation to ease keeping the patch 'up to date' with
: the trunk?

One trick i've seen people talk about but haven't had much experience with
myself is that if a patch made by "svn diff" doesn't apply cleanly with
the truck because of subsequent changes, grep the patch for the svn
reviewion that the patch is based on, run 'svn update -r ####" to revert
your working copy to that verion, apply the patch, then run "svn update"
to get back to the head ... "they" say that sometimes hte incrimental
nature of "svn udpate" can rectify the changes better then patch (since
patch only knows what the current version looks like)

i tried it once with a patch that didn't apply cleanly and it worked well,
(but one test is not a solid foundation to judge as a general rule)


-Hoss

Reply via email to