Fossil

Timeline
Login

Timeline

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

10 check-ins related to "merge-renames"

2016-05-16
17:46
Improve the merge command's ability to handle various scenarios involving renames. ... (check-in: 41c22209 user: drh tags: trunk)
2016-05-12
21:11
Properly update the execute bit if it has changed in the commit being merged, and add info about changed permissions to the merge command's output. ... (Closed-Leaf check-in: 3683508e user: joel tags: merge-renames)
20:18
Remove unnecessary code. ... (check-in: c8421e92 user: joel tags: merge-renames)
2016-05-11
22:23
Remove unnecessary first commit (that isn't actually a commit because I didn't call "fossil add" first...) in test 8. ... (check-in: 1385c8d4 user: joel tags: merge-renames)
02:29
Ensure that N is also a first-parent ancestor of P for cases where P is not on the same branch as either V or M. ... (check-in: 8bf221e5 user: joel tags: merge-renames)
2016-05-09
23:48
Call pivot_set_*() before each pivot_find() call. ... (check-in: ec25471c user: joel tags: merge-renames)
2016-05-06
20:27
Handle merges with a specified baseline that comes after a commit with renames. ... (check-in: 8da901bb user: joel tags: merge-renames)
20:00
find_filename_changes() should report a rename even if the file ends up reverting back to its original name. ... (check-in: 0e9d50b1 user: joel tags: merge-renames)
19:49
Improve the merge command's ability to handle various scenarios involving renames. ... (check-in: 423029b1 user: joel tags: merge-renames)
2016-05-03
20:30
Update referenced OpenSSL version. ... (check-in: 53992512 user: mistachkin tags: trunk)