equal
deleted
inserted
replaced
48 $ mkcommit B0 |
48 $ mkcommit B0 |
49 $ hg up 0 |
49 $ hg up 0 |
50 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
50 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
51 $ cd ../client |
51 $ cd ../client |
52 $ hg pull |
52 $ hg pull |
53 pulling from $TESTTMP/D3/server (glob) |
53 pulling from $TESTTMP/D3/server |
54 searching for changes |
54 searching for changes |
55 adding changesets |
55 adding changesets |
56 adding manifests |
56 adding manifests |
57 adding file changes |
57 adding file changes |
58 added 1 changesets with 1 changes to 1 files |
58 added 1 changesets with 1 changes to 1 files |
84 |
84 |
85 Actual testing |
85 Actual testing |
86 -------------- |
86 -------------- |
87 |
87 |
88 $ hg push --rev 'desc(A1)' |
88 $ hg push --rev 'desc(A1)' |
89 pushing to $TESTTMP/D3/server (glob) |
89 pushing to $TESTTMP/D3/server |
90 searching for changes |
90 searching for changes |
91 abort: push creates new remote head f6082bc4ffef! |
91 abort: push creates new remote head f6082bc4ffef! |
92 (merge or see 'hg help push' for details about pushing new heads) |
92 (merge or see 'hg help push' for details about pushing new heads) |
93 [255] |
93 [255] |
94 $ hg push --rev 'desc(B1)' |
94 $ hg push --rev 'desc(B1)' |
95 pushing to $TESTTMP/D3/server (glob) |
95 pushing to $TESTTMP/D3/server |
96 searching for changes |
96 searching for changes |
97 abort: push creates new remote head 25c56d33e4c4! |
97 abort: push creates new remote head 25c56d33e4c4! |
98 (merge or see 'hg help push' for details about pushing new heads) |
98 (merge or see 'hg help push' for details about pushing new heads) |
99 [255] |
99 [255] |
100 |
100 |
102 ------------- |
102 ------------- |
103 |
103 |
104 In this case, even a bare push is creating more heads |
104 In this case, even a bare push is creating more heads |
105 |
105 |
106 $ hg push |
106 $ hg push |
107 pushing to $TESTTMP/D3/server (glob) |
107 pushing to $TESTTMP/D3/server |
108 searching for changes |
108 searching for changes |
109 abort: push creates new remote head 25c56d33e4c4! |
109 abort: push creates new remote head 25c56d33e4c4! |
110 (merge or see 'hg help push' for details about pushing new heads) |
110 (merge or see 'hg help push' for details about pushing new heads) |
111 [255] |
111 [255] |
112 |
112 |