Show More
@@ -125,19 +125,19 hg push -r 10 -r 11 ../f; echo $? | |||||
125 |
|
125 | |||
126 | echo % checking prepush logic does not allow silently pushing multiple new heads |
|
126 | echo % checking prepush logic does not allow silently pushing multiple new heads | |
127 | cd .. |
|
127 | cd .. | |
128 |
hg init |
|
128 | hg init h | |
129 |
echo init > |
|
129 | echo init > h/init | |
130 |
hg -R |
|
130 | hg -R h ci -Am init | |
131 |
echo a > |
|
131 | echo a > h/a | |
132 |
hg -R |
|
132 | hg -R h ci -Am a | |
133 |
hg clone |
|
133 | hg clone h i | |
134 | hg -R g up 0 |
|
|||
135 | echo b > g/b |
|
|||
136 | hg -R g ci -Am b |
|
|||
137 | hg -R h up 0 |
|
134 | hg -R h up 0 | |
138 |
echo |
|
135 | echo b > h/b | |
139 |
hg -R h ci -Am |
|
136 | hg -R h ci -Am b | |
140 |
hg -R |
|
137 | hg -R i up 0 | |
|
138 | echo c > i/c | |||
|
139 | hg -R i ci -Am c | |||
|
140 | hg -R i push h | |||
141 | echo |
|
141 | echo | |
142 |
|
142 | |||
143 | exit 0 |
|
143 | exit 0 |
@@ -125,18 +125,17 adding file changes | |||||
125 | added 2 changesets with 2 changes to 1 files |
|
125 | added 2 changesets with 2 changes to 1 files | |
126 | 0 |
|
126 | 0 | |
127 | % checking prepush logic does not allow silently pushing multiple new heads |
|
127 | % checking prepush logic does not allow silently pushing multiple new heads | |
128 | abort: repository g already exists! |
|
|||
129 | adding init |
|
128 | adding init | |
130 | adding a |
|
129 | adding a | |
131 | updating working directory |
|
130 | updating working directory | |
132 |
|
|
131 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
133 |
|
|
132 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
134 | adding b |
|
133 | adding b | |
135 | created new head |
|
134 | created new head | |
136 |
|
|
135 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
137 | adding c |
|
136 | adding c | |
138 | created new head |
|
137 | created new head | |
139 |
pushing to |
|
138 | pushing to h | |
140 | searching for changes |
|
139 | searching for changes | |
141 | abort: push creates new remote heads! |
|
140 | abort: push creates new remote heads! | |
142 | (did you forget to merge? use push -f to force) |
|
141 | (did you forget to merge? use push -f to force) |
General Comments 0
You need to be logged in to leave comments.
Login now