On Wed, Jun 4, 2014 at 1:42 PM, Andy Bradford <amb-fos...@bradfords.org> wrote:
> Thus said Richard Hipp on Wed, 04 Jun 2014 07:47:43 -0400: > > > The merge logic in Fossil recognizes when the same exact change is > > merged more than once and avoids conflicts in that case. The Q-cards > > are not necessary for this. > > What am I doing wrong then? In this case, I did a cherrypick and > committed to get 738e72e3d9; then right after I merge from the same > checkin as the Q-card, but the diff shows that it duplicated the content > (I did not add the line in the diff, the merge did): > No merge is perfect. Apparently you hit a bad case. But I do similar things all the time on actual source code and rarely have problems. -- D. Richard Hipp d...@sqlite.org
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
