Re: Re: using patch to manage differences

Update!

I finally got this to work, but now I have a related question.

After two days of reviewing logs to try to understand this, it turns out
that I had created the patches in a branch and merged everything back to the
trunk. Fortunately the branch still existed. I merged changes from the
trunk back to the branch and commited the branch. Then I attempted to apply
the patch and voila! This time it worked. I did get a conflict on this
file (which I expected). After editing the conflicts, I was able to
re-create the patch for Environment B. Likewise for Environment C. Now I
can merge these changes to the trunk.

So the new question is, what will happen if I blow the branch away? Aside
from the fact that it will still be in SVN's history, will I have this
problem every time? Is there something I can do now on the trunk (recreate
the patches?) that will allow this to work?

-- 
Kerry Carroll
carrolky_at_alumni.uc.edu