also sprach Manoj Srivastava <[EMAIL PROTECTED]> [2008.02.20.1722 +0100]: > I have to take care of it manually once. That is the first time > I setup the integration branch that merges in changes from the > overlapping feature branches. This is not a big deal, because the > human has to spend some time disambiguating the overlap. > > It is critical to me that I never have to spend that time > again -- and in my case, I never do, since future non overlapping > changes (like, say, a new upstream release) produce deltas that apply > to the feature and integration branches seamlessly. I never have to > rethink or redo any patches.
What if feature B depends on feature A and a new upstream causes a merge conflict in feature A. Then you have to fix feature A, which causes a conflict with feature B. Now you have to redo the entire integration, taking care to merge in the right order... > > Yes, just like I want to have feature branches instead of one gigantic > > debian branch. > > I use my CSM to provide me the changeset: > baz diff <branch A> <upstream> That does not help me during an NMU from the source package. -- .''`. martin f. krafft <[EMAIL PROTECTED]> : :' : proud Debian developer, author, administrator, and user `. `'` http://people.debian.org/~madduck - http://debiansystem.info `- Debian - when you have better things to do than fixing systems "work consists of whatever a body is obliged to do. play consists of whatever a body is not obliged to do." -- mark twain
digital_signature_gpg.asc
Description: Digital signature (see http://martin-krafft.net/gpg/)
