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.

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?

% fossil init foo.fossil
project-id: 7d89af8b56ab77954fef7f3998deafeb1f5d1351
server-id:  109835e0eaf1e80971f35cbf7c1f931bd7e394ae
admin-user: npostavs (initial password is "7ef356")
% fossil open foo.fossil
% echo blah > foo.txt
% fossil add foo.txt
ADDED  foo.txt
% fossil set gdiff 'fossil test-echo'
% fossil gdiff
ADDED    foo.txt
% fossil ci --branch other-branch -m foo.txt
New_Version: 9434663b6cbef39baa19e624bfd124c9b2a6bf28
% fossil up trunk
REMOVE foo.txt
-------------------------------------------------------------------------------
updated-to:   b7f9c580599de1598cf8a3f95b17625ce8f2244a 2015-10-25 04:13:04 UTC
tags:         trunk
comment:      initial empty check-in (user: npostavs)
changes:      1 file modified.
 "fossil undo" is available to undo changes to the working checkout.
% fossil merge other-branch
ADDED foo.txt
 "fossil undo" is available to undo changes to the working checkout.
% fossil changes
ADDED_BY_MERGE foo.txt
MERGED_WITH 9434663b6cbef39baa19e624bfd124c9b2a6bf28
% fossil gdiff
ADDED_BY_MERGE foo.txt
% fossil undo
DELETE foo.txt
% fossil merge --integrate other-branch
ADDED foo.txt
 "fossil undo" is available to undo changes to the working checkout.
% fossil changes
ADDED_BY_INTEGRATE foo.txt
INTEGRATE  9434663b6cbef39baa19e624bfd124c9b2a6bf28
% fossil gdiff
Index: foo.txt
==================================================================
g.nameOfExe = [fossil]
argv[0] = [fossil]
argv[1] = [test-echo]
argv[2] = [/home/npostavs/tmp/tmprepo/foo.txt~0]
argv[3] = [/home/npostavs/tmp/tmprepo/foo.txt]
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to