equal
deleted
inserted
replaced
54 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
54 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
55 $ mkcommit C0 |
55 $ mkcommit C0 |
56 created new head |
56 created new head |
57 $ cd ../client |
57 $ cd ../client |
58 $ hg pull |
58 $ hg pull |
59 pulling from $TESTTMP/D5/server (glob) |
59 pulling from $TESTTMP/D5/server |
60 searching for changes |
60 searching for changes |
61 adding changesets |
61 adding changesets |
62 adding manifests |
62 adding manifests |
63 adding file changes |
63 adding file changes |
64 added 2 changesets with 2 changes to 2 files (+1 heads) |
64 added 2 changesets with 2 changes to 2 files (+1 heads) |
91 |
91 |
92 Actual testing |
92 Actual testing |
93 -------------- |
93 -------------- |
94 |
94 |
95 $ hg push --rev 'desc(B1)' |
95 $ hg push --rev 'desc(B1)' |
96 pushing to $TESTTMP/D5/server (glob) |
96 pushing to $TESTTMP/D5/server |
97 searching for changes |
97 searching for changes |
98 abort: push creates new remote head 25c56d33e4c4! |
98 abort: push creates new remote head 25c56d33e4c4! |
99 (merge or see 'hg help push' for details about pushing new heads) |
99 (merge or see 'hg help push' for details about pushing new heads) |
100 [255] |
100 [255] |
101 $ hg push --rev 'desc(A1)' |
101 $ hg push --rev 'desc(A1)' |
102 pushing to $TESTTMP/D5/server (glob) |
102 pushing to $TESTTMP/D5/server |
103 searching for changes |
103 searching for changes |
104 adding changesets |
104 adding changesets |
105 adding manifests |
105 adding manifests |
106 adding file changes |
106 adding file changes |
107 added 1 changesets with 1 changes to 1 files |
107 added 1 changesets with 1 changes to 1 files |