equal
deleted
inserted
replaced
45 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
45 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
46 $ cd server |
46 $ cd server |
47 $ mkcommit B0 |
47 $ mkcommit B0 |
48 $ cd ../client |
48 $ cd ../client |
49 $ hg pull |
49 $ hg pull |
50 pulling from $TESTTMP/C1/server (glob) |
50 pulling from $TESTTMP/C1/server |
51 searching for changes |
51 searching for changes |
52 adding changesets |
52 adding changesets |
53 adding manifests |
53 adding manifests |
54 adding file changes |
54 adding file changes |
55 added 1 changesets with 1 changes to 1 files |
55 added 1 changesets with 1 changes to 1 files |
73 |
73 |
74 Actual testing |
74 Actual testing |
75 -------------- |
75 -------------- |
76 |
76 |
77 $ hg push |
77 $ hg push |
78 pushing to $TESTTMP/C1/server (glob) |
78 pushing to $TESTTMP/C1/server |
79 searching for changes |
79 searching for changes |
80 abort: push creates new remote head 25c56d33e4c4! |
80 abort: push creates new remote head 25c56d33e4c4! |
81 (merge or see 'hg help push' for details about pushing new heads) |
81 (merge or see 'hg help push' for details about pushing new heads) |
82 [255] |
82 [255] |
83 |
83 |