Re: [pcgen] [bug] [Trackered] Roll method not saving
> Even this strictness which is difficult to manage andI think the second clause in your statement is the significant one.
> way beyond what this project can stand is not
> Say I have two commits to the truck,Believe it or not, it's not that difficult. You'd merge the changes
> commit 1 modifies lines 4 and 10 of file a and commit
> 2 modifies lines 4 and 5 of file a. Now I decide I
> want commit 2 in the branch. How do I do that?
made to file "a" in rev 2, which do *not* include the changes made in
rev 1, to whatever working copy you wanted them in.
Your example where the same line is modified in both revs is a little
trickier, but it's still doable. Unrelated changes to the same line of
code, so closely located in time is really a rather pathological case
As you say, though, not recommended for this project.
> Backporting is a bad idea (which at times is required)I don't know that I'd go so far as "bad", but it's certainly a practice
> and developing a process around it is an even worse
that benefits from thought and discipline.