j. van den hoff wrote:
On Mon, 16 May 2016 19:02:17 +0200, Warren Young <w...@etr-usa.com>
wrote:
1. f finfo can’t trace file history back through a rename. The web
version of this (f ui > Files > Ancestry) does manage to report the
rename, but it doesn’t trace history back through that link to the
old name. Why would I want file history to cut off just because I
renamed it?
2. If you attempt to merge a change between branches where one of the
changed files was renamed after the branch point, Fossil will
*silently* drop all changes to that file. Then it will lie to you,
telling you the merge was successful! If the resulting partial merge
compiles and runs, you might not immediately notice that you didn’t
get 100% of the feature/fix. (This happened to me just a week or two
ago!)
I think I also ran into both of these problems and the second one,
obviously, is really bad (and the first one bad enough: it's presence
heavily discourages one (at least me...) from doing otherwise
desirable tidyups...). I do hope there is a chance to see this fixed
in future versions (considering there are users able to recognize a
problem but not to fix it ;-))
Not that this is much consolation to you, Warren, or anyone else that
ever had to deal with this, but the merge issue will be fixed in the
next release (or now if you compile your own Fossil binary):
https://www.fossil-scm.org/index.html/info/41c2220934de8cb8
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users