Show More
@@ -1039,14 +1039,10 b' class localrepository(object):' | |||||
1039 | self.ui.status(_("no changes found\n")) |
|
1039 | self.ui.status(_("no changes found\n")) | |
1040 | return 1 |
|
1040 | return 1 | |
1041 | elif not force: |
|
1041 | elif not force: | |
1042 | if revs is not None: |
|
1042 | # FIXME we don't properly detect creation of new heads | |
1043 | updated_heads = {} |
|
1043 | # in the push -r case, assume the user knows what he's doing | |
1044 | for base in msng_cl: |
|
1044 | if not revs and len(remote_heads) < len(heads) \ | |
1045 | for parent in self.changelog.parents(base): |
|
1045 | and remote_heads != [nullid]: | |
1046 | if parent in remote_heads: |
|
|||
1047 | updated_heads[parent] = True |
|
|||
1048 | updated_heads = updated_heads.keys() |
|
|||
1049 | if len(updated_heads) < len(heads): |
|
|||
1050 | self.ui.warn(_("abort: push creates new remote branches!\n")) |
|
1046 | self.ui.warn(_("abort: push creates new remote branches!\n")) | |
1051 | self.ui.status(_("(did you forget to merge?" |
|
1047 | self.ui.status(_("(did you forget to merge?" | |
1052 | " use push -f to force)\n")) |
|
1048 | " use push -f to force)\n")) |
@@ -30,9 +30,13 b' searching for changes' | |||||
30 | no changes found |
|
30 | no changes found | |
31 | pushing to ../c |
|
31 | pushing to ../c | |
32 | searching for changes |
|
32 | searching for changes | |
33 | abort: push creates new remote branches! |
|
33 | adding changesets | |
34 | (did you forget to merge? use push -f to force) |
|
34 | adding manifests | |
|
35 | adding file changes | |||
|
36 | added 2 changesets with 2 changes to 1 files (+2 heads) | |||
35 | pushing to ../c |
|
37 | pushing to ../c | |
36 | searching for changes |
|
38 | searching for changes | |
37 | abort: push creates new remote branches! |
|
39 | adding changesets | |
38 | (did you forget to merge? use push -f to force) |
|
40 | adding manifests | |
|
41 | adding file changes | |||
|
42 | added 1 changesets with 1 changes to 1 files |
General Comments 0
You need to be logged in to leave comments.
Login now