Show More
@@ -1527,7 +1527,7 b' class localrepository(repo.repository):' | |||||
1527 | warn = 1 |
|
1527 | warn = 1 | |
1528 |
|
1528 | |||
1529 | if warn: |
|
1529 | if warn: | |
1530 |
self.ui.warn(_("abort: push creates new remote |
|
1530 | self.ui.warn(_("abort: push creates new remote heads!\n")) | |
1531 | self.ui.status(_("(did you forget to merge?" |
|
1531 | self.ui.status(_("(did you forget to merge?" | |
1532 | " use push -f to force)\n")) |
|
1532 | " use push -f to force)\n")) | |
1533 | return None, 0 |
|
1533 | return None, 0 |
@@ -1,7 +1,7 b'' | |||||
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2 | pushing to ../a |
|
2 | pushing to ../a | |
3 | searching for changes |
|
3 | searching for changes | |
4 |
abort: push creates new remote |
|
4 | abort: push creates new remote heads! | |
5 | (did you forget to merge? use push -f to force) |
|
5 | (did you forget to merge? use push -f to force) | |
6 | pulling from ../a |
|
6 | pulling from ../a | |
7 | searching for changes |
|
7 | searching for changes | |
@@ -12,7 +12,7 b' added 1 changesets with 1 changes to 1 f' | |||||
12 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
12 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
13 | pushing to ../a |
|
13 | pushing to ../a | |
14 | searching for changes |
|
14 | searching for changes | |
15 |
abort: push creates new remote |
|
15 | abort: push creates new remote heads! | |
16 | (did you forget to merge? use push -f to force) |
|
16 | (did you forget to merge? use push -f to force) | |
17 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
17 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
18 | (branch merge, don't forget to commit) |
|
18 | (branch merge, don't forget to commit) | |
@@ -31,7 +31,7 b' 0 files updated, 1 files merged, 0 files' | |||||
31 | (branch merge, don't forget to commit) |
|
31 | (branch merge, don't forget to commit) | |
32 | pushing to ../c |
|
32 | pushing to ../c | |
33 | searching for changes |
|
33 | searching for changes | |
34 |
abort: push creates new remote |
|
34 | abort: push creates new remote heads! | |
35 | (did you forget to merge? use push -f to force) |
|
35 | (did you forget to merge? use push -f to force) | |
36 | 1 |
|
36 | 1 | |
37 | pushing to ../c |
|
37 | pushing to ../c | |
@@ -40,12 +40,12 b' no changes found' | |||||
40 | 0 |
|
40 | 0 | |
41 | pushing to ../c |
|
41 | pushing to ../c | |
42 | searching for changes |
|
42 | searching for changes | |
43 |
abort: push creates new remote |
|
43 | abort: push creates new remote heads! | |
44 | (did you forget to merge? use push -f to force) |
|
44 | (did you forget to merge? use push -f to force) | |
45 | 1 |
|
45 | 1 | |
46 | pushing to ../c |
|
46 | pushing to ../c | |
47 | searching for changes |
|
47 | searching for changes | |
48 |
abort: push creates new remote |
|
48 | abort: push creates new remote heads! | |
49 | (did you forget to merge? use push -f to force) |
|
49 | (did you forget to merge? use push -f to force) | |
50 | 1 |
|
50 | 1 | |
51 | pushing to ../c |
|
51 | pushing to ../c |
General Comments 0
You need to be logged in to leave comments.
Login now