Show More
@@ -155,6 +155,30 b' Rebase the working copy parent' | |||||
155 | | o 1: fc055c3b4d33 'b' |
|
155 | | o 1: fc055c3b4d33 'b' | |
156 | |/ |
|
156 | |/ | |
157 | o 0: b173517d0057 'a' |
|
157 | o 0: b173517d0057 'a' | |
|
158 | ||||
|
159 | ||||
|
160 | Test reporting of path conflicts | |||
|
161 | ||||
|
162 | $ hg rm a | |||
|
163 | $ mkdir a | |||
|
164 | $ touch a/a | |||
|
165 | $ hg ci -Am "a/a" | |||
|
166 | adding a/a | |||
|
167 | $ hg tglog | |||
|
168 | @ 4: daf7dfc139cb 'a/a' | |||
|
169 | | | |||
|
170 | o 3: 844a7de3e617 'c' | |||
|
171 | | | |||
|
172 | | o 2: 09c044d2cb43 'd' | |||
|
173 | | | | |||
|
174 | | o 1: fc055c3b4d33 'b' | |||
|
175 | |/ | |||
|
176 | o 0: b173517d0057 'a' | |||
|
177 | ||||
|
178 | $ hg rebase -r . -d 2 | |||
|
179 | rebasing 4:daf7dfc139cb "a/a" (tip) | |||
|
180 | abort: error: 'a/a' conflicts with file 'a' in 2. | |||
|
181 | [255] | |||
158 |
|
182 | |||
159 | $ cd .. |
|
183 | $ cd .. | |
160 |
|
184 |
General Comments 0
You need to be logged in to leave comments.
Login now