Fossil: Check-in [281e5121]

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

Overview

Comment:	More comments about tests I'd like to write.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| merge_renames
Files:	files \| file ages \| folders
SHA1:	281e5121e7e91bf3e99427cf38d46272b31e5e01
User & Date:	viriketo 2011-08-30 08:00:52

Context

2011-08-30
08:01		Updating from trunk to keep up working in the branch with the most recent fossil code. (check-in: 75aaf30a user: viriketo tags: merge_renames)
08:00		More comments about tests I'd like to write. (check-in: 281e5121 user: viriketo tags: merge_renames)
2011-08-05
12:43		Taking a note about a new test I should write about merges with renames.. (check-in: b78d9999 user: viriketo tags: merge_renames)

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to test/merge_renames.test.


######################################
#  Test 3                            #
#  Reported: Ticket [30b28cf351]     #
######################################

# TO BE WRITTEN.








>
>
>
>
>
>
>
>
>
>
>
>
>
>


######################################
#  Test 3                            #
#  Reported: Ticket [30b28cf351]     #
######################################

# TO BE WRITTEN.

######################################
#  Test 4                            #
#  Reported: Ticket [67176c3aa4]     #
######################################

# TO BE WRITTEN.


# Tests for troubles not specifically linked with renames but that I'd like to
# write:
#  [c26c63eb1b] - 'merge --backout' does not handle conflicts properly
#  [953031915f] - Lack of warning when overwriting extra files 
#  [4df5f38f1e] - Troubles merging a file delete with a file change