Fossil

Check-in [62f4a8a6]
Login

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

Overview
Comment: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.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | merge_renames
Files: files | file ages | folders
SHA1: 62f4a8a61ce5ed83ca80e65fe55c606dca790a0d
User & Date: viriketo 2011-08-31 20:34:37.177
Context
2011-09-01
22:05
Add in the merge_renames test script from the similarly named branch. ... (check-in: fcd68266 user: drh tags: trunk)
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. ... (Closed-Leaf check-in: 62f4a8a6 user: viriketo tags: merge_renames)
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)
Changes
Unified Diff Ignore Whitespace Patch
Changes to test/merge_renames.test.
︙︙
125
126
127
128
129
130
131


132











































133
134
135
136
137
138
139

exec rm rep.fossil

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



# TO BE WRITTEN.












































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

# TO BE WRITTEN.








>
>
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>








125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184

exec rm rep.fossil

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

fossil new rep.fossil
fossil open rep.fossil

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

write_file f2 "line2"
fossil add f2
fossil commit -m "newfile"

fossil mv f2 f2new
exec mv f2 f2new
fossil commit -m "rename"

fossil update pivot
write_file f1 "line3"
fossil commit -b branch -m "change"

fossil merge trunk
fossil commit -m "trunk merged"

fossil update trunk

fossil merge branch
puts $RESULT

# Not a nice way to check, but I don't know more tcl now
set deletes 0
foreach {status filename} $RESULT {
    if {$status=="DELETE"} {
        set deletes [expr $deletes + 1]
    }
}

if {$deletes!=0} {
    # failed
    protOut "Error, the merge should not delete any file"
    test merge_renames-2 0
} else {
    test merge_renames-2 1
}

fossil close -f
exec rm rep.fossil

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

# TO BE WRITTEN.
︙︙