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
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
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
My situation:
* Working on a new feature.
* Multiple files edited.
* Notice a bug in another file, fix it.
* Decide to commit just that file with the fix.
* Type: fossil com -m Small fix. [and crucially press enter by mistake
before specifying the file name to commit]
* ALL changes get committed
On 8/15/12 12:21 PM, Nick Zalutskiy wrote:
Ideally I'd like to revert that commit somehow and do two smaller
commits thereafter. Since there is no rewriting history in fossil, I
assume that this would involve doing a new commit that is the
opposite of the incorrect one, and then replying the
Hello,
I think I just found out that it has been added recently (2012-08-07) on the to
do list at:
http://www.fossil-scm.org/index.html/wiki?name=To+Do+List
Described as: Web-based file editing
---
Simon Tremblay
On 8/15/12 12:21 PM, Nick Zalutskiy wrote:
Ideally I'd like to revert that commit somehow and do two smaller
commits thereafter. Since there is no rewriting history in fossil, I
assume that this would involve doing a new commit that is the
opposite of the incorrect one, and then replying the
7 matches
Mail list logo
