On Thursday 18 October 2007 22:54, Michael Short wrote: > On 10/18/07, Kern Sibbald <[EMAIL PROTECTED]> wrote: > > Well, I think we should figure out what went wrong with the prior patch > > before we work on doing another one. You sent me two patch files, and > > there is a small but non-zero chance that I applied the wrong one. > > I believe the patch applied correctly, but I neglected to let you know > about the new files.
OK, thanks for looking into it. > > > I'm not sure why you "backported" your patch. Unless I am fixing a bug > > in an old version of Bacula, I *always* work on the current version of > > the SVN. Having a patch for a prior version of the SVN only complicates > > the process. > > I assumed my error was creating a bad patch, but in fact I just forgot > to let you know about the new files. > > > If you create any new files, you must explicitly tell me, or they will > > not be added to the SVN. No, the above command that you provide will > > definitely not work. > > Right, sorry. Nothing to be sorry about. It is something new. It is really rare that someone sends me a patch with new files -- it was logical in this case because they correspond to the new tests that have been added over the last 6 months. I'm as guilty as you. > > > I'm sending you a copy of the file that I used to patch the SVN, and ask > > you to take a look at it to see if I applied the correct file or the > > incorrect file. Once we establish what happened, we can figure out what > > to do. > > The patch went fine, I will create an additional patch with any > adittional changes I have in the format you have provided. Also, when > I submit a new patch I will also paste the results of "svn status" in > my message to make it easy to see changes and added files. Yes, that is a good idea. > > > By the way, in checking what the last patch did, I see that there were 16 > > new files that were added. If you wish, I can either add them to the SVN > > and commit them, or delete them. I propose to add them, then you work > > from the SVN including your first patch. > > Only add the files from the original patch, ignore msbr10172007-5704.diff. OK, I have added them all and committed them to the SVN. If you do an "svn update", you should get them now. > > Once again, my apologies for the confusion. I'm very new to working in > an environment like this, so I am bound to make mistakes. Again, nothing to be sorry about. No harm was done, and you did take the time to check and found the problem, and we also understand what happened. That is all that counts. Thanks, Kern ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Bacula-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/bacula-devel
