##// 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 1433 self.ui.warn(_("abort: push creates new remote branches!\n"))
1434 1434 self.ui.status(_("(did you forget to merge?"
1435 1435 " use push -f to force)\n"))
1436 return None, 1
1436 return None, 0
1437 1437 elif inc:
1438 1438 self.ui.warn(_("note: unsynced remote changes!\n"))
1439 1439
@@ -33,7 +33,7 b' pushing to ../c'
33 33 searching for changes
34 34 abort: push creates new remote branches!
35 35 (did you forget to merge? use push -f to force)
36 0
36 1
37 37 pushing to ../c
38 38 searching for changes
39 39 no changes found
@@ -42,12 +42,12 b' pushing to ../c'
42 42 searching for changes
43 43 abort: push creates new remote branches!
44 44 (did you forget to merge? use push -f to force)
45 0
45 1
46 46 pushing to ../c
47 47 searching for changes
48 48 abort: push creates new remote branches!
49 49 (did you forget to merge? use push -f to force)
50 0
50 1
51 51 pushing to ../c
52 52 searching for changes
53 53 adding changesets
General Comments 0
You need to be logged in to leave comments. Login now