Re: [fossil-users] fossil gdiff shows diffs on ADDED_BY_INTEGRATE files

[Joe Mistachkin]

Noam Postavsky wrote:
> 
> It doesn't for ADDED or ADDED_BY_MERGE (which is good because seeing
> every line added in a diff viewer isn't so helpful). I'm sure this is
> just a missing clause in an if somewhere.
> 

Thanks for the report.  Should be fixed on trunk.

> 
> Also, my fossil clone with remote "http://fossil-scm.org; seems to be
> stuck at 975600dd599fff84 (i.e. fossil update does not advance it any
> further). Am I using the wrong remote or something?
> 

What version of Fossil are you using?  Does it give an error message of
any kind?  What does 'fossil status' say?  Also, can you try running
'fossil test-integrity'?

--
Joe Mistachkin

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] fossil gdiff shows diffs on ADDED_BY_INTEGRATE files

[Noam Postavsky]

On 10/25/15, Joe Mistachkin  wrote:
>
> What version of Fossil are you using?  Does it give an error message of
> any kind?  What does 'fossil status' say?  Also, can you try running
> 'fossil test-integrity'?

Oh, I just noticed my installed fossil version was ancient: 1.25!
After updating, *and* doing a 'fossil rebuild', it finds the correct
tip of trunk.

'fossil test-integrity' mentions some "phantoms", doesn't seem to be
problem though.

% fossil leaves --bybranch | head -2
*** trunk ***
   (1) 2015-05-12 10:42:20 [975600dd59] Make addremove command to fail
if unprocessed arguments (other than options) are specified. To avoid
mis-use where a user could think he can specify a list of directory
like with many other commands. (user: mgagnon tags: trunk)
% fossil timeline | head -2
=== 2015-10-26 ===
01:18:10 [a6b999ce13] Skip diff for files that are ADDED_BY_INTEGRATE.
(user: mistachkin)
% fossil version
This is fossil version 1.34 [26d903de0c] 2015-10-24 14:10:21 UTC
% fossil test-integrity
skip phantom 17771 ee2d352b3e23c80eaf4bfa5465be546b12db6e1b
skip phantom 31128 ab58aacfbe23fc2fe849eff53306daa9199a7f7f
skip phantom 31550 edf1bee5f2a3577138c6df087565fe5462d99926
31974 non-phantom blobs (out of 31977 total) checked:  0 errors
% fossil rebuild
  100.0% complete...
% fossil leaves --bybranch | head -2
*** trunk ***
   (1) 2015-10-26 01:18:10 [a6b999ce13] Skip diff for files that are
ADDED_BY_INTEGRATE. (user: mistachkin tags: trunk)
% fossil update
Autosync:  http://fossil-scm.org
Round-trips: 1   Artifacts sent: 0  received: 0
Pull done, sent: 366  received: 1143  ip: 67.18.92.124
UPDATE Dockerfile
[...]
---
updated-to:   a6b999ce131c0f17c4c1e3350f5aa97db4a268f0 2015-10-26 01:18:10 UTC
tags: trunk
comment:  Skip diff for files that are ADDED_BY_INTEGRATE. (user:
mistachkin)
changes:  119 files modified.
 "fossil undo" is available to undo changes to the working checkout.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users