Thus said Rolf Ade on Thu, 05 May 2016 02:55:49 +0200: > Looking at the timeline, web or cli, I'm bemazed that I didn't see any > sign of my maneuver. 'Normal' merges between branches are shown by the > lines and arrows in the web interface. Cherrypick and backout merges > are not. Although it is part of the history of what I have done, and > that was, what fossil promesses to keep.
As Richard mentioned, the cherrypick and backout are actually recorded as part of the history, though not currently displayed in the UI. This is done with the Q-card in the manifest. When you cherrypick you get a Q-card that looks like: Q +1718aa7cd353195ac1186ca9a1aa8fe8bc5e9297 When you backout you get one that looks like: Q -c4391bdd9f1426c64433d9655faf80c304416a43 To see these, open the UI and then click on one of the checkins where you used cherrypick or backout. Then click on link to see the manifest. One day, someone may get the itch to present them in the timeline... It's also possible to include a comment in the commit log that links them, e.g.: fossil commit -m 'Cherrypick: [1718aa7cd3] to get feature X' fossil commit -m 'Backout: [c4391bdd9f142] made an oops' Another alternative to a backout is to simply move the commit to a branch named ``mistake'' and then close the leaf, leaving the original branch intact. This works well if the checkin being backed out is a leaf. Here is an example where you can see that [050412b8] was a mistake and rather than use --backout, it was just moved out of the way with a branch: http://www.fossil-scm.org/index.html/timeline?c=2014-01-16+11:56:09&n=11&unhide Andy -- TAI64 timestamp: 40000000572add4a _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
