RFC: commit-to-branch

Martin Pool mbp at canonical.com
Tue Dec 2 00:01:29 GMT 2008


So (after a bit of off-mail conversation), it looks like Robert's
considering a command or option that will essentially take the
uncommitted changes, merge them into another thread or branch where
they must cleanly apply, commit that, then merge that back into the
current thread (stepwise up the loom if necessary), then commit that
change onto the original branch, then update the tree onto the new
merge commit.

It perhaps sounds longwinded like that, but it's a reasonable case, if
you've discovered maybe just one hunk that ought to be committed
elsewhere.

I do have a feeling that this is adding one large CISC-type operation,
and there'll be some users who want to do something similar but not
quite the same.  For instance they might want to inspect the result of
the merge before committing it, or deal with conflicts there.  I
realize it's common not to, but it'd also be reasonable to do it.  I
have some inclination to accommodate the simpler cases first, so they
can be more flexibly combined, and because it can help user
understanding to see them exposed.

However, if you're motivated to do this specific case first, do it.

-- 
Martin <http://launchpad.net/~mbp/>



More information about the bazaar mailing list