Hi Robert, Very sorry for the trouble. I think the only way would be to redo the 4 commits. Actually, we were applying patches individually from trunk to hcat-intre and were not using svn merge. So I couldn't integrate with trunk using svn merge reintegrate. I had to merge with trunk by applying the patch created using diff from trunk. I must have missed back porting those commits to hcat-intre and so they were removed as part of the patch. Again sorry about that. I have attached the patch used for merging to OOZIE-561.
Regards, virag On 2/26/13 2:37 PM, "Robert Kanter" <[email protected]> wrote: >Hi, > >It looks like the merging caused the commits I made on Feb 21st to be >lost. > The commits are still there, but the commit "Merging hcat-intre to trunk" >(r1449911) undid the changes that they made. >This includes: > 1) OOZIE-1220 Make the login example cookie expire (rkanter) >[r1448829] > 2) OOZIE-1219 The timezone cookie should never expire (rkanter) >[r1448835] > 3) Amending release-log for OOZIE-669 [r1448841] > 4) Updating release-log [r1448880] > >What's the best way to add the changes back? Just to recommit the four >commits? > >I think that's all, but is there an easy way to check if anything else got >undone? > >thanks >- Robert > > > >On Mon, Feb 25, 2013 at 1:47 PM, Virag Kothari <[email protected]> >wrote: > >> Hi, >> >> The hcat-intre branch has been merged to trunk. >> >> Thanks, >> Virag >>
