On 5/17/2015 7:45 PM, Andy Goth wrote:
>
http://www.mail-archive.com/fossil-users%40lists.fossil-scm.org/msg20586.html

I found another consequence.  This affects the finfo command.

Test case from before:

f init x.fossil
mkdir x
cd x
f open ../x.fossil
touch file1 file2
f add *
f commit -m 1
echo hello > file2
f commit -branch branch -m 2
f up trunk
echo hello2 > file1
f commit -m 3
f merge -integrate branch
f commit -m 4

Running finfo (deleted "user: andy" for brevity):

$ f finfo file1
2015-08-03 [34b42d0572] 4 (artifact: [0d2aae7d15], branch: trunk)
2015-08-03 [bd57f6ec06] 3 (artifact: [0d2aae7d15], branch: trunk)
2015-08-03 [9fac5e4c62] 1 (artifact: [da39a3ee5e], branch: trunk)

$ f finfo file2
2015-08-03 [34b42d0572] 4 (artifact: [f572d396fa], branch: trunk)
2015-08-03 [37e7a23167] 2 (artifact: [f572d396fa], branch: branch)
2015-08-03 [9fac5e4c62] 1 (artifact: [da39a3ee5e], branch: trunk)

file2 shows the same artifact [f572d396fa] in two commits, but this is
to be expected since the work was first done on a branch then integrated
to trunk.

file1 also shows the same artifact [0d2aae7d15] in two commits, but I
find this to be bogus because the last commit (the one with comment "4")
didn't actually touch file1.  All it did was integrate branch to trunk,
and the only thing that was done on branch was change file2.

-- 
Andy Goth | <andrew.m.goth/at/gmail/dot/com>

Attachment: signature.asc
Description: OpenPGP digital signature

_______________________________________________
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