Fossil SCM

← Back to file

test/merge6.test

50 commits
Merge from trunk.
ashepilko 19997e99c… 2018-08-02 08:32
Merge trunk
jan.nijtmans d15c1ba0f… 2017-08-31 01:59
Merge trunk
jan.nijtmans 4bf7e4ef5… 2017-03-06 15:32
Merge in latest from trunk
nick.lloyd 85a0ada69… 2016-09-21 16:06
Merge with trunk; resolved tar and zip generation to handle include/exclude globs.
jan de9e7651a… 2016-08-03 01:18
Merge in trunk and resolve conflict.
andybradford 003b6581e… 2016-07-04 20:13
merge trunk
jan.nijtmans 414fc1e95… 2016-06-22 09:11
merge from trunk with a few tweaks for merge conflicts
scott 598b58a5e… 2016-05-31 08:17
Merge trunk
andygoth ca59c662d… 2016-05-23 15:46
Merge trunk
andygoth 83bd4f37b… 2016-05-23 15:45
Merge trunk
andygoth 6164dac54… 2016-05-23 15:37
merge cleanX
jan.nijtmans 70f77a1b6… 2016-05-21 23:58
Merge trunk
jan.nijtmans a2c0e3f22… 2016-05-21 23:48
Improve the merge command's ability to handle various scenarios involving renames.
drh 41c222093… 2016-05-16 17:46
Improve the merge command's ability to handle various scenarios involving renames.
joel 423029b15… 2016-05-06 19:49
Merge trunk.
andygoth 023601fb1… 2016-04-10 02:14
Merge trunk.
andygoth 12810dbf6… 2016-04-10 02:13
Updating from trunk.
viriketo a1b095597… 2016-04-08 13:03
Merged trunk for changes since January and test suite improvements.
rberteig 8fa24960a… 2016-03-13 23:55
Merged updates from trunk. Builds on Windows.
rberteig 9a41671bb… 2016-03-11 23:45
Cleanup, modularize, and robustify all test setup and cleanup.
mistachkin fa5922169… 2016-03-08 19:37
Merge updates from trunk.
mistachkin ff4a4fe6b… 2016-03-06 06:35
Merge updates from trunk.
mistachkin 4bd2b5459… 2016-03-06 06:35
Merge updates from trunk.
mistachkin abd131b83… 2016-03-06 06:26
Rename the test suite procedure 'repo_init' to 'test_setup'.
drh 413921cca… 2016-03-02 20:43
More work...
mistachkin 29f0328cd… 2016-03-02 06:45
Merge from trunk.
jan ea7f32970… 2016-02-04 15:22
Merge updates from trunk. Fix compiler warnings.
mistachkin cfd3a5b94… 2016-01-28 20:54
Merge the new knownBug constraint support from trunk.
rberteig 2ada5ec76… 2016-01-27 02:29
Add 'knownBug' constraints to the two failing merge tests along with the necessary test suite chang…
mistachkin 60285f587… 2016-01-27 01:44
Merged from trunk with a few tiny edits to make new functionality work on Windows
sdr 8f33e49dd… 2015-09-03 23:15
Bring svn import up to date in an attempt to finish it
baruch c75ca53ee… 2015-08-26 09:34
merge trunk
jan.nijtmans cac5cbae7… 2015-07-14 19:54
merge trunk
jan.nijtmans 3ddf95e33… 2015-07-14 09:55
Merge trunk.
andygoth f3daf3935… 2015-06-26 18:48
Merge trunk.
andygoth cc8e56f19… 2015-06-19 15:44
Merge trunk.
andygoth 21220b21b… 2015-06-19 15:44
merge trunk
jan.nijtmans 7699d1410… 2015-05-30 08:53
Enhance file_tree_name() to be capable of producing absolute paths within the local tree. Fix --ha…
mistachkin c56a387d4… 2015-05-29 17:14
Have all appropriate tests use 'normalize_result' instead of a raw 'string map'.
mistachkin d2cf0713e… 2015-05-27 18:37
Merge updates from trunk.
mistachkin 06ffd8009… 2015-04-03 02:36
Merge trunk
jan.nijtmans 1be2eb053… 2015-02-06 15:38
Workaround for recently introduced Cygwin bug: group permission is always set! This was the cause o…
jan.nijtmans d9dfe11d0… 2015-02-06 15:34
merge trunk
jan.nijtmans 9bc76f6a1… 2015-02-06 10:49
Restructure import.c, making it easier to compare with the new svn-import code. No change in functi…
jan.nijtmans 3209f0728… 2015-02-06 10:47
merge trunk
jan.nijtmans bddc40ced… 2015-02-06 10:02
Restructure import.c, making it easier to compare with the new svn-import code. No change in functi…
jan.nijtmans 62a998755… 2015-02-06 10:00
merge cleanX
jan.nijtmans 5b40b55b6… 2014-12-01 17:25
merge trunk
jan.nijtmans 12667b95b… 2014-11-28 17:35
Merge from trunk
ashish 26b7b16a7… 2014-11-11 12:15

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button