On 1/8/16, Stephan Beal <sgb...@googlemail.com> wrote: > Good morning, > > this morning i noticed a curiosity: > > http://fossil.wanderinghorse.net/r/cwal/info/d53c6a40e7f5a861 > > look at the "context part" and note the 2 arrows going from trunk into a > branch and the next commit in that branch, as if both derived from it. > Looking at the manifest of the second one, it does indeed have 2 parents > (one from the fork, one from the branch). > > _Maybe_ (don't remember) i merged that second branch commit from the trunk > (which was a no-op, since there were no changes), causing this. If so, > should fossil remember a merge which makes no changes?
There is no logic for "merge" to detect no-op merges and refuse to record them. But I suppose we could add that. > > (Or is there something else which can cause this?) > -- D. Richard Hipp d...@sqlite.org _______________________________________________ fossil-dev mailing list fossil-dev@mailinglists.sqlite.org http://mailinglists.sqlite.org/cgi-bin/mailman/listinfo/fossil-dev
