Richard Hipp writes: > On Mon, Oct 4, 2010 at 9:50 PM, Ashish SHUKLA <[email protected]> wrote:
>> Hi everyone,
>>
>> I started using Fossil few days ago, after listening to Fossil BSD talk[1],
>> and so far, I'm happy with its feature set. Thanks :)
>>
>> Recently I wanted to revert a commit to previous one (git equivalent: git
>> reset HEAD^), and I used following commands:
>>
>> % git checkout ${previous_timeline_id}
>> ../modify files/..
>> % git add changed-file1 changed-file2
>> % git commit -m "Fixed a bug"
>> fossil: would fork. "update" first or use -f or --force.
>> % fossil commit -f -m 'Fixed a bug'
>> New_Version: 2c0240d4572b90773c0d3d7a2cec198067a7866b
>> **** warning: a fork has occurred *****
>>
>> Now, as I see in timeline in web UI, I see two commits. I'm wondering if
>> there
>> is any way to purge the other commit ?
>>
>> And I'm also curious if there is any technical significance of "closed
>> leave" ?
>>
> Move the unwanted commit into a special branch (perhaps named "mistake") so
> that it doesn't get mixed up with the trunk. Then mark it "closed".
> You can "shun" the manifest file if you want, but that is discouraged. The
> idea behind Fossil is that it remembers everything, including your
> mistakes.
This seems fair.
Thanks for the reply.
--
Ashish SHUKLA | GPG: F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0
freebsd.org!ashish | http://people.freebsd.org/~ashish/
Avoid Success At All Costs !!
pgp61BR8EuEUf.pgp
Description: PGP signature
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
