On Tue, 7 Dec 2010 15:17:43 -0500, Barry Warsaw <[email protected]> wrote: > >> So now what do I do? I've got the change sitting in a quilt patch and in > >> my > >> tree. I clearly can't submit a merge proposal in this state. > > > >That is the expected thing to submit as it maintains the above invariant. > > Maybe I misunderstand. Do you mean you recommend against reverting the > non-debian directory changes before submitting the merge proposal? That would > be counter to how I would work out the patch using apt-get source - I'd end up > pushing the changes back into quilt and that would revert the in-tree changes, > right? Also, if I were reviewing an mp with the changes both in quilt and in > tree, I'd complain about it.
I meant that it is expected to submit it with the change sitting in a quilt patch and in the tree. > (Ideally I think the fact that quilt is there would be hidden from you, and > you'd just see the in-tree changes, but we've had that discussion before, so > let's ignore that for now.) This is why I believe looms are a high priority. Thanks, James -- ubuntu-distributed-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel
