##// END OF EJS Templates
tests: test renaming a file added on two branches (issue2089)...
Wagner Bruna -
r13492:ca940d06 stable
parent child Browse files
Show More
@@ -125,3 +125,33 b' Check for issue2642'
125
125
126 $ cat f2
126 $ cat f2
127 c0
127 c0
128
129 Check for issue2089
130
131 $ hg init repo2089
132 $ cd repo2089
133
134 $ echo 0 > A
135 $ hg -q ci -Am 0
136
137 $ hg -q up -C null
138 $ echo 1 > A
139 $ hg -q ci -Am 1
140
141 $ hg -q up -C 0
142 $ hg merge 1 -q --tool internal:local
143 $ echo 2 > A
144 $ hg -q ci -m 2
145
146 $ hg -q up -C 1
147 $ hg mv A a
148 $ hg -q ci -Am 3
149
150 $ hg -q up -C 2
151 $ hg merge 3
152 merging A and a to a
153 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
154 (branch merge, don't forget to commit)
155
156 $ cat a
157 2
General Comments 0
You need to be logged in to leave comments. Login now