##// END OF EJS Templates
prepush: add more test cases
Peter Arrenbrecht -
r10909:29a83fb8 stable
parent child Browse files
Show More
@@ -264,4 +264,40 b' hg out inner --template "{rev}: {branche'
264 hg push inner
264 hg push inner
265 cd ..
265 cd ..
266
266
267 echo % check prepush with new branch head and new child of former branch head
268 echo % but child is on different branch
269 hg init p
270 cd p
271 hg branch A
272 echo a0 >a
273 hg ci -Ama0
274 echo a1 >a
275 hg ci -ma1
276 hg up null
277 hg branch B
278 echo b0 >b
279 hg ci -Amb0
280 echo b1 >b
281 hg ci -mb1
282
283 hg clone . inner
284
285 hg up A
286 hg branch -f B
287 echo a3 >a
288 hg ci -ma3
289 hg up 3
290 hg branch -f A
291 echo b3 >b
292 hg ci -mb3
293
294 echo %% glog of local
295 hg glog --template "{rev}: {branches} {desc}\n"
296 echo %% glog of remote
297 hg glog -R inner --template "{rev}: {branches} {desc}\n"
298 echo %% outgoing
299 hg out inner --template "{rev}: {branches} {desc}\n"
300 hg push inner
301 cd ..
302
267 exit 0
303 exit 0
@@ -258,3 +258,48 b' adding changesets'
258 adding manifests
258 adding manifests
259 adding file changes
259 adding file changes
260 added 1 changesets with 1 changes to 1 files
260 added 1 changesets with 1 changes to 1 files
261 % check prepush with new branch head and new child of former branch head
262 % but child is on different branch
263 marked working directory as branch A
264 adding a
265 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
266 marked working directory as branch B
267 adding b
268 created new head
269 updating to branch B
270 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
271 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
272 marked working directory as branch B
273 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
274 marked working directory as branch A
275 %% glog of local
276 @ 5: A b3
277 |
278 | o 4: B a3
279 | |
280 o | 3: B b1
281 | |
282 o | 2: B b0
283 /
284 o 1: A a1
285 |
286 o 0: A a0
287
288 %% glog of remote
289 @ 3: B b1
290 |
291 o 2: B b0
292
293 o 1: A a1
294 |
295 o 0: A a0
296
297 %% outgoing
298 comparing with inner
299 searching for changes
300 4: B a3
301 5: A b3
302 pushing to inner
303 searching for changes
304 abort: push creates new remote heads on branch 'A'!
305 (did you forget to merge? use push -f to force)
General Comments 0
You need to be logged in to leave comments. Login now