Mercurial > hg
comparison tests/test-push-warn.out @ 10909:29a83fb8c067 stable
prepush: add more test cases
author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
---|---|
date | Wed, 14 Apr 2010 19:35:54 +0200 |
parents | 816bac2f9452 |
children | a101a743c570 |
comparison
equal
deleted
inserted
replaced
10908:816bac2f9452 | 10909:29a83fb8c067 |
---|---|
256 note: unsynced remote changes! | 256 note: unsynced remote changes! |
257 adding changesets | 257 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) |