I think what happened is that the file got deleted in the trunk (by another merge) and the OP expected it to be re-added by the last merge because the file was there.
Is this by design? I would've expected it too. Original Message From: Warren Young Sent: Friday, 17 April 2015 06:46 To: Fossil SCM user's discussion Reply To: Fossil SCM user's discussion Subject: Re: [fossil-users] Merge - including files from other branches - best practice? On Apr 16, 2015, at 2:44 PM, Warren Young <w...@etr-usa.com> wrote: > > On Apr 16, 2015, at 10:47 AM, Johan Kuuse <jo...@kuu.se> wrote: >> >> In c-stdin, I created the file b64.c > > That’s not what this says: Also, notice that the checkin that claims to have created b64.c actually modifies the copy created on the trunk: http://kuu.se/fossil/b64.cgi/info/71a14569b473e988f5824c10d09506e67f32d070 _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
