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): $ fossil stat | grep checkout checkout: 738e72e3d9cfe5568c94940c09ada1b78341ac68 2014-06-04 03:48:59 UTC $ fossil art 738e72e3d9cfe5568c94940c09ada1b78341ac68 C six D 2014-06-04T03:48:59.091 F file 2dfb8ca405192b966ad859171e7a52141fa90d73 P 6b8b667ee4c9f7176410c90f99d0a43aa33f30b0 Q +c14a4a93d5a353f1a887b0ddd7c37f33ce45569f R 36855f79a36bd6536f8584211e9077df U amb Z 03e53539308b57abb68256d198c87954 $ fossil merge c14a4a MERGE file "fossil undo" is available to undo changes to the working checkout. $ fossil diff Index: file ================================================================== --- file +++ file @@ -1,2 +1,3 @@ 21443 +3661 3661 Thanks, Andy -- TAI64 timestamp: 40000000538f5a94 _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
