How can I subtract two svn patch files? -



How can I subtract two svn patch files? -

i have patch-queue scheme (like offered guilt or mercurial-mq) on top of svn.

svn able export patch files, represent difference remote working copy. can utilize this, , create patch every time alter something, patch contain previous changes made. doesn't create problems when applying patch, because redundant parts ignored.

even so, patches contain changes made lastly patch saved current working copy, more flexible. can delete patch "revert" it, or can take apply subset of patches. in order this, think thing need tool can subtract 2 patches.

for instance, given 001.patch:

index: myrepo/myfile.h =================================================================== --- myrepo/myfile.h (revision 200) +++ myrepo/myfile.h (working copy) @@ -283,1 +283,1 @@ void f();

and 002.tmp.patch:

index: myrepo/myfile.h =================================================================== --- myrepo/myfile.h (revision 200) +++ myrepo/myfile.h (working copy) @@ -283,1 +283,1 @@ void f(); index: myrepo/myfile.c =================================================================== --- myrepo/myfile.c (revision 200) +++ myrepo/myfile.c (working copy) @@ -283,1 +283,1 @@ void f() { }

i obtain 002.patch:

index: myrepo/myfile.c =================================================================== --- myrepo/myfile.c (revision 200) +++ myrepo/myfile.c (working copy) @@ -283,1 +283,1 @@ void f() { }

of course, much less obvious when things removed or modified. anyway, i'd happy plenty hunk-level subtraction (one takes 002.tmp.patch , removes hunks have identical re-create in 001.patch)

the interdiff tool can asked for. http://www.linuxcommand.org/man_pages/interdiff1.html

svn patch

Comments

Post a Comment

Popular posts from this blog

model view controller - MVC Rails Planning -

model view controller - MVC Rails Planning - i'm starting rails , i'm building app stores films info, user can watch film , give grade on web application. i have coded cinema model, controller , views. now, have 2 questions: should need create model , controller grading? in case, should create or should wait , create first users model , controller? yes, on model , controller grades. that'd feasible way maintain track of who's graded what. it's create first, i'd start users, since grades depend on both films , users. ruby-on-rails model-view-controller
Read more

ruby on rails - Devise Logout Error in RoR -

ruby on rails - Devise Logout Error in RoR - while using devise in ror, encountering unusual error when trying log out url different root url. displays me : actioncontroller::invalidauthenticitytoken in devise::sessionscontroller#destroy" for illustration if rooting path after log in '/structure', , seek log out '/general' error, while logging out '/structure' fine. any help highly appreciated. ruby-on-rails ruby devise
Read more

html - Submenu setup with jquery and effect 'fold' -

html - Submenu setup with jquery and effect 'fold' - i want open submenu jquery effect fold, problem if user "hover effect" fast menu remain open, how can avoid this, jquery code is: $('ul.mainmenu li').hover( function() { $(this).children('ul').show('fold', 570); }, function() { $(this).children('ul').hide('fold', 500); } ); my jsfiddle link is: http://jsfiddle.net/9wkbf/ updated fiddle the reason behind problem is, first event $(this).children('ul').show('fold', 570); queued , until completes, sec animation not start. the next snippet can workaround $('ul.mainmenu > li').hover( function() { $(this).children('ul').show('fold', 570); }, function() { $('ul:not(.mainmenu)').hide('fold', 500); } ); *important note : work current scenario. jquery html css
Read more