Fossil

File History
Login

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

History of test/merge_renames.test

2017-01-27
08:57
Openssl 1.0.2j -> 1.0.2k. Whitespace. file: [2ecb429a] check-in: [8cb5da6f] user: jan.nijtmans branch: trunk, size: 12969
2016-12-28
18:20
Update test case now that merge rename bug has been fixed with checkin [0df5249d51]. file: [cdeca008] check-in: [b09be7ba] user: andybradford branch: trunk, size: 12970
2016-11-12
22:58
Move the revert in test case to the correct sequence to avoid a merge conflict. file: [d5c23fbb] check-in: [3eeab4a5] user: andybradford branch: trunk, size: 12694
22:19
Add test case to handle file add and rename before merging to trunk. Make test_setup return the repository path so it can be used in the test. file: [ad186192] check-in: [6a5f0c5b] user: andybradford branch: trunk, size: 12694
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. file: [73a5d0e4] check-in: [1385c8d4] user: joel branch: merge-renames, size: 10921
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. file: [afce36a9] check-in: [8bf221e5] user: joel branch: merge-renames, size: 10987
2016-05-06
20:27
Handle merges with a specified baseline that comes after a commit with renames. file: [fca33be0] check-in: [8da901bb] user: joel branch: merge-renames, size: 9703
20:00
find_filename_changes() should report a rename even if the file ends up reverting back to its original name. file: [0b720d97] check-in: [0e9d50b1] user: joel branch: merge-renames, size: 8842
19:49
Improve the merge command's ability to handle various scenarios involving renames. file: [727794e3] check-in: [423029b1] user: joel branch: merge-renames, size: 7468
2016-03-02
20:43
Rename the test suite procedure 'repo_init' to 'test_setup'. file: [e0b500a8] check-in: [413921cc] user: mistachkin branch: testerCleanup, size: 4230
06:45
More work... file: [2e0c0e6f] check-in: [29f0328c] user: mistachkin branch: testerCleanup, size: 4226
06:22
Work in progress on cleaning up home/repo handling in the test suite. file: [b18be8d5] check-in: [89f76a21] user: mistachkin branch: testerCleanup, size: 4131
2016-01-27
01:44
Add 'knownBug' constraints to the two failing merge tests along with the necessary test suite changes. file: [426dc718] check-in: [60285f58] user: mistachkin branch: trunk, size: 4254
2015-08-15
18:48
Remove stray debugging output in tests. file: [97d1fb5d] check-in: [5fdf670f] user: mistachkin branch: trunk, size: 4245
2015-05-27
18:37
Have all appropriate tests use 'normalize_result' instead of a raw 'string map'. file: [1c7c8130] check-in: [d2cf0713] user: mistachkin branch: mvRmHardFix, size: 4259
2014-07-13
03:37
Add new test that demonstrates an issue (during merging) with renaming a file and then adding a file with the old name in the same commit. file: [23036947] check-in: [25fe7658] user: mistachkin branch: trunk, size: 4290
2014-03-17
14:15
skip some tests when running inside of an open checkout. file: [8587eb2f] check-in: [36a8d91d] user: jan.nijtmans branch: trunk, size: 3569
2014-02-22
05:31
Add some utility functions to tester.tcl to reduce boilerplate code in certain tests. file: [2e28af1b] check-in: [23d3113b] user: joel branch: trunk, size: 3406
2014-02-13
05:36
Replace 'exec mv/rm' with 'file rename/delete' in tests. file: [0255bd0c] check-in: [c3d36f16] user: joel branch: trunk, size: 3934
2011-10-14
19:01
Fixing the merge_renames test; fossil was using $HOME somehow. I noticed it running the test in an environment without a valid $HOME path (the nix package building). fossil refused to run the 'fossil new' inside the merge_renames test. file: [5e04c75d] check-in: [bf480a29] user: viriketo branch: declined, size: 3889
2011-10-12
16:20
Fixing the merge_renames test, so it accepts being called out of a repository. The message given by fossil when trying 'info' out of a repository had changed. file: [bcb8c119] check-in: [0a7ab3cc] user: viriketo branch: trunk, size: 3749
2011-08-31
20:34
Adding a new test I wanted to write. I just saw this in my local copy, but I really forgot if I finished it or not. file: [32f096e4] check-in: [62f4a8a6] user: viriketo branch: merge_renames, size: 3760
2011-08-30
08:00
More comments about tests I'd like to write. file: [f606abe9] check-in: [281e5121] user: viriketo branch: merge_renames, size: 2948
2011-08-05
12:43
Taking a note about a new test I should write about merges with renames.. file: [9fa15247] check-in: [b78d9999] user: viriketo branch: merge_renames, size: 2479
2011-06-17
20:13
Adding a new test (this failed by current trunk) based on ticket [74413366fe]. file: [09921997] check-in: [b2e7370e] user: viric branch: merge_renames, size: 2304
19:09
Adding a first test for merging branches with renames. Related to ticket [554f44ee74]. file: [62ebaaff] check-in: [8526b151] user: viriketo branch: merge_renames, size: 1199 Added