Yeah, that's a pain in the butt. If they're in completely different files, what you can do is just move the part for that particular file between patches by editing them by hand. If you have changes mixed up in the same file it can be fixed, but it's more involved. I had to move some edits between patches for some x86 stuff recently and it worked, but it's a pain. Like I was saying though, if you're patches are in a repository somebody can help you straighten that out.
Gabe Korey Sewell wrote: > On the comment thing, I'm saying I realized too late that I had two > distinct changes in one patch, so took the shortcut of commenting out > one so I could have a separate patch with the diff. change. > > On Mon, Nov 24, 2008 at 11:11 PM, Gabe Black <[EMAIL PROTECTED]> wrote: > >> Korey Sewell wrote: >> >>>> How about when Korey's ready, he takes a break and lets us work on the >>>> diffs a bit before they go in the tree? Let us know when you're ready >>>> Korey. >>>> >>>> >>> Sure, I'm getting things back to respectability and should be ready >>> for public consumption soon. >>> >>> I'd thought I just email out patches a little at a time (instead of >>> like 40 at a time) just to give people an idea of what's coming. >>> >>> Let me know if that's a good plan or if the separate repo thing is >>> something people really want to do. >>> ---------- >>> Korey L Sewell >>> Graduate Student - PhD Candidate >>> Computer Science & Engineering >>> University of Michigan >>> _______________________________________________ >>> m5-dev mailing list >>> m5-dev@m5sim.org >>> http://m5sim.org/mailman/listinfo/m5-dev >>> >>> >> It's not really a separate repo, it's a repo for your patches >> themselves. You can have those in their own repository so we can see >> them and update them, but you (and we) keep working on the regular >> repository underneath. What Nate was talking about is that if two people >> change a patch and mercurial tries to merge the changes, it really just >> makes a huge mess. I'm not sure I follow what you were saying about the >> commented out lines in exetrace.cc. If you're change isn't compatible >> with those lines then you might want to put all that into one patch. >> Otherwise when somebody looks back through the history, they won't be >> able to (easily) see past where those lines changed and then changed >> back. If it was for debugging, what I do is I make a patch with just my >> debugging hacks, and then once I'm done with them I can just pop them >> off the queue and throw them away. That keeps them from getting mixed up >> in other stuff, and if you realize you need your hack again you can (if >> you kept the patch) just stick it back in there. >> >> Gabe >> _______________________________________________ >> m5-dev mailing list >> m5-dev@m5sim.org >> http://m5sim.org/mailman/listinfo/m5-dev >> >> > > > > _______________________________________________ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev
