##// END OF EJS Templates
push: exit(1) if "push creates new remote branches!"
Alexis S. L. Carvalho -
r6098:65340b82 default
parent child Browse files
Show More
@@ -1433,7 +1433,7 b' class localrepository(repo.repository):'
1433 self.ui.warn(_("abort: push creates new remote branches!\n"))
1433 self.ui.warn(_("abort: push creates new remote branches!\n"))
1434 self.ui.status(_("(did you forget to merge?"
1434 self.ui.status(_("(did you forget to merge?"
1435 " use push -f to force)\n"))
1435 " use push -f to force)\n"))
1436 return None, 1
1436 return None, 0
1437 elif inc:
1437 elif inc:
1438 self.ui.warn(_("note: unsynced remote changes!\n"))
1438 self.ui.warn(_("note: unsynced remote changes!\n"))
1439
1439
@@ -33,7 +33,7 b' pushing to ../c'
33 searching for changes
33 searching for changes
34 abort: push creates new remote branches!
34 abort: push creates new remote branches!
35 (did you forget to merge? use push -f to force)
35 (did you forget to merge? use push -f to force)
36 0
36 1
37 pushing to ../c
37 pushing to ../c
38 searching for changes
38 searching for changes
39 no changes found
39 no changes found
@@ -42,12 +42,12 b' pushing to ../c'
42 searching for changes
42 searching for changes
43 abort: push creates new remote branches!
43 abort: push creates new remote branches!
44 (did you forget to merge? use push -f to force)
44 (did you forget to merge? use push -f to force)
45 0
45 1
46 pushing to ../c
46 pushing to ../c
47 searching for changes
47 searching for changes
48 abort: push creates new remote branches!
48 abort: push creates new remote branches!
49 (did you forget to merge? use push -f to force)
49 (did you forget to merge? use push -f to force)
50 0
50 1
51 pushing to ../c
51 pushing to ../c
52 searching for changes
52 searching for changes
53 adding changesets
53 adding changesets
General Comments 0
You need to be logged in to leave comments. Login now