Fossil: Check-in [8526b151]

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

Overview

Comment:	Adding a first test for merging branches with renames. Related to ticket [554f44ee74].
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| merge_renames
Files:	files \| file ages \| folders
SHA1:	8526b151fc96aea93050a21212f2337236fa0940
User & Date:	viriketo 2011-06-17 19:09:45
Original User & Date:	viric 2011-06-17 19:09:45

Context

2011-06-17
20:13		Adding a new test (this failed by current trunk) based on ticket [74413366fe]. (check-in: b2e7370e user: viric tags: merge_renames)
19:09		Adding a first test for merging branches with renames. Related to ticket [554f44ee74]. (check-in: 8526b151 user: viriketo tags: merge_renames)
15:13		Fixes to "export --git". Changes spaces in tag names to "_" since Git cannot deal with spaces in tag names. Make sure the name of the committer is well-formed according to git's definition of well-formedness. (check-in: b707622f user: drh tags: trunk)

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Added test/merge_renames.test.

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

#
# Tests for merging with renames
# 
#

catch {exec $::fossilexe info} res
puts res=$res
if {![regexp {not within an open checkout} $res]} {
  puts stderr "Cannot run this test within an open checkout"
  return
}

#################
#  Test 1       #
#################

fossil new rep.fossil
fossil open rep.fossil

write_file f1 "line"
fossil add f1
fossil commit -m "c1"
fossil tag add pivot current

write_file f1 "line2"
fossil commit -m "c2"

write_file f1 "line3"
fossil commit -m "c3"

write_file f1 "line4"
fossil commit -m "c4"

write_file f1 "line5"
fossil commit -m "c4"

write_file f1 "line6"
fossil commit -m "c4"

fossil update pivot
puts $RESULT
fossil mv f1 f2
exec mv f1 f2
fossil commit -b rename -m "c5"

fossil merge trunk
fossil commit -m "trunk merged"

fossil update pivot
write_file f3 "someline"
fossil add f3
fossil commit -b branch2 -m "newbranch"

fossil merge trunk
puts $RESULT

# Not a nice way to check, but I don't know more tcl now
foreach {status filename} $RESULT {
    if {$status=="DELETED"} {
        protOut "Error, the merge should not delete any file"
        test merge_renames-1 0
    }
    if {$status=="UPDATE"} {
        test merge_renames-1 1
    }
}