R: New Jurassic Version

21 views
Skip to first unread message

marko...@inwind.it

unread,
Nov 24, 2010, 7:52:07 AM11/24/10
to jurassi...@googlegroups.com

>I see you've currently removed the diff display and moved it back to
>having the web browser display it instead. Thank you. Until Fossil gets
>the proper fix for its EOL issues, it should probably be moved back
>there for now.

The diff display is still there (just press "Diff" button), the web browser
link for diffs are on the other window (which I didn't change since 0.2.4)... :
^P

>Although this is not necessarily for Jurassic, I'm thinking maybe Fossil
>should adopt Git's stance of allowing Windows users the option of
>"Windows-style EOL on checkout, *nix ones on check-in"? Would this make
>Jurassic produce a better diff display on Windows?

The "diff display" is a printout of "fossil diff". Do you see any difference?
Could you please post a screenshot?
However, in future I think I will use a third party diff viewer. I don't
really want to reinvent the wheel.

>
>In any case, thanks for fixing the timeline view issue.

You're welcome!

Arnel Legaspi

unread,
Nov 24, 2010, 2:01:36 PM11/24/10
to jurassi...@googlegroups.com
On 11/24/2010 8:52 PM, marko...@inwind.it wrote:
>> Although this is not necessarily for Jurassic, I'm thinking maybe Fossil
>> should adopt Git's stance of allowing Windows users the option of
>> "Windows-style EOL on checkout, *nix ones on check-in"? Would this make
>> Jurassic produce a better diff display on Windows?
>
> The "diff display" is a printout of "fossil diff". Do you see any difference?
> Could you please post a screenshot?

I've posted a screenshot here:

http://imgur.com/t8L3w

As you can see, the space below the menu ribbon is empty. Behind the two
windows is Firefox showing me the diff.

> However, in future I think I will use a third party diff viewer. I don't
> really want to reinvent the wheel.

I usually use the diff that comes with MinGW/MSYS instead. Gives out
better patch files, especially when I have to "shelve" what I'm doing
temporarily.

--Arnel

marko...@inwind.it

unread,
Nov 25, 2010, 4:10:02 AM11/25/10
to Jurassic-fossil
> I've posted a screenshot here:
>
> http://imgur.com/t8L3w
>
> As you can see, the space below the menu ribbon is empty. Behind the two
> windows is Firefox showing me the diff.

Did you press "Diff"?

> I usually use the diff that comes with MinGW/MSYS instead. Gives out
> better patch files, especially when I have to "shelve" what I'm doing
> temporarily.

What is this diff? I'm currently evaluating kdiff3 (which comes with
TortoiseHg).
And BTW, why do you need to "shelve" something when you have a
repository? Isn't that redundant?

Arnel Legaspi

unread,
Nov 25, 2010, 1:21:55 PM11/25/10
to jurassi...@googlegroups.com
On 11/25/2010 5:10 PM, marko...@inwind.it wrote:
>> I've posted a screenshot here:
>>
>> http://imgur.com/t8L3w
>>
>> As you can see, the space below the menu ribbon is empty. Behind the two
>> windows is Firefox showing me the diff.
>
> Did you press "Diff"?

Yes I did. That's why it opened up Firefox, to show me the diff.

>> I usually use the diff that comes with MinGW/MSYS instead. Gives out
>> better patch files, especially when I have to "shelve" what I'm doing
>> temporarily.
>
> What is this diff? I'm currently evaluating kdiff3 (which comes with
> TortoiseHg).

It's the GNU diff. I don't remember why I didn't just say it outright,
but it's the GNU diff ported for Windows.

> And BTW, why do you need to "shelve" something when you have a
> repository? Isn't that redundant?

I "shelve" something I'm currently working on when I know it's not yet
ready for committing, so it won't be lost when I do something else,
e.g., pull in changes from another repo.

Git and Bzr have this functionality built in, IIRC, and Hg has an
extension for it.

Michele Marcon

unread,
Nov 26, 2010, 2:54:12 AM11/26/10
to Jurassic-fossil
> Yes I did. That's why it opened up Firefox, to show me the diff.

Then I think you have changed the default diff; the default diff
prints out on the Jurassic window.

> I "shelve" something I'm currently working on when I know it's not yet
> ready for committing, so it won't be lost when I do something else,
> e.g., pull in changes from another repo.
>
> Git and Bzr have this functionality built in, IIRC, and Hg has an
> extension for it.

Is this the "staging area"?

Arnel Legaspi

unread,
Nov 26, 2010, 1:38:30 PM11/26/10
to jurassi...@googlegroups.com
On 11/26/2010 3:54 PM, Michele Marcon wrote:
>> Yes I did. That's why it opened up Firefox, to show me the diff.
>
> Then I think you have changed the default diff; the default diff
> prints out on the Jurassic window.

Got it, thanks.

>> I "shelve" something I'm currently working on when I know it's not yet
>> ready for committing, so it won't be lost when I do something else,
>> e.g., pull in changes from another repo.
>>
>> Git and Bzr have this functionality built in, IIRC, and Hg has an
>> extension for it.
>
> Is this the "staging area"?

I suppose it is, except that Git defines it explicitly, compared to Hg &
Bzr.

Reply all
Reply to author
Forward
0 new messages