On 9/14/07, Karl Hasselström <kha@xxxxxxxxxxx> wrote: > On 2007-09-14 10:15:11 -0400, Jon Smirl wrote: > > > Does it make sense to mix pushing and reordering in the push > > command, or should reordering always be done with the sink and float > > commands? > > You can get any kind of reordering done using just push and pop. For > example, if you have (bottom to the left, top to the right) > > p1, p2, p3, p4 > > and want > > p1, p4, p3, p2 > > this will do it (barring any merge conflicts, naturally): > > $ stg pop p2 p3 > $ stg push p3 p2 > > Does this cover what you had in mind? Sure this works. I'm just wondering if it is a good idea to have separate reordering commands for patches that are applied vs unapplied. The separate commands confused me. Would it be better to simply prohibit reordering of apply patches and require that they be popped before they can be reordered? A sink/float that causes merge errors must be a mess to sort out. If you prohibit reordering of applied patches sink/float can be eliminated. Another way to handle this would be to eliminate the ability of pop/push to reorder and extend sink/float to handle unapplied patches. > > -- > Karl Hasselström, kha@xxxxxxxxxxx > www.treskal.com/kalle > -- Jon Smirl jonsmirl@xxxxxxxxx - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
