Re: [fossil-users] Rebase is NOT fundamentally incompatible with Fossil

2012-08-16 Thread Nico Williams
On Wed, Aug 15, 2012 at 11:26 AM, Richard Hipp d...@sqlite.org wrote: On Wed, Aug 15, 2012 at 12:22 PM, Nico Williams n...@cryptonector.com wrote: Is there any way to request that the changes from a commit be merged into the workspace but not committed? fossil merge will only merge changes

Re: [fossil-users] Rebase is NOT fundamentally incompatible with Fossil

2012-08-15 Thread Richard Hipp
On Wed, Aug 15, 2012 at 12:03 AM, Nico Williams n...@cryptonector.comwrote: On Tue, Aug 14, 2012 at 8:28 PM, Matt Welland estifo...@gmail.com wrote: I like the idea of cherry picking to a new branch. This would have nicely solved a few problems I've faced. I suppose you can kind of do this

Re: [fossil-users] Rebase is NOT fundamentally incompatible with Fossil

2012-08-15 Thread David Given
Richard Hipp wrote: [...] Note that the merge command also includes the --baseline option. The --baseline option can identify the start of a sequence of checkins that you want to merge. Suppose there are some sequence of changes in another branch A-B-C-D. If you do fossil merge D

Re: [fossil-users] Rebase is NOT fundamentally incompatible with Fossil

2012-08-15 Thread Nico Williams
On Wed, Aug 15, 2012 at 5:48 AM, Richard Hipp d...@sqlite.org wrote: On Wed, Aug 15, 2012 at 12:03 AM, Nico Williams n...@cryptonector.com wrote: There is a cherrypick command? Oh, it's an option to the fossil merge command. I had missed that entirely! The --cherrypick option has been

[fossil-users] Rebase is NOT fundamentally incompatible with Fossil

2012-08-14 Thread Nico Williams
Provocative Subject: line, I know. But it's true, git-like rebase is not incompatible with Fossil's principles *provided* that the result of a rebase is a new branch, or provided that the branch being affected has no children (i.e., that it's a private branch). I use git a lot, and I like it. I

Re: [fossil-users] Rebase is NOT fundamentally incompatible with Fossil

2012-08-14 Thread Matt Welland
I like the idea of cherry picking to a new branch. This would have nicely solved a few problems I've faced. I suppose you can kind of do this now using fossil cherrypick and manually creating the new branch but the equivalency to the original edits is not preserved and merging back into a stream

Re: [fossil-users] Rebase is NOT fundamentally incompatible with Fossil

2012-08-14 Thread Nico Williams
On Tue, Aug 14, 2012 at 8:28 PM, Matt Welland estifo...@gmail.com wrote: I like the idea of cherry picking to a new branch. This would have nicely solved a few problems I've faced. I suppose you can kind of do this now using fossil cherrypick and manually creating the new branch but the There