##// END OF EJS Templates
bookmarks: allow pushing active bookmark on new remote head (issue5236)...
liscju -
r29229:89bba2be stable
parent child Browse files
Show More
@@ -240,15 +240,16 b' def _oldheadssummary(repo, remoteheads, '
240 240
241 241 def _nowarnheads(pushop):
242 242 # Compute newly pushed bookmarks. We don't warn about bookmarked heads.
243
244 # internal config: bookmarks.pushing
245 newbookmarks = pushop.ui.configlist('bookmarks', 'pushing')
246
247 243 repo = pushop.repo.unfiltered()
248 244 remote = pushop.remote
249 245 localbookmarks = repo._bookmarks
250 246 remotebookmarks = remote.listkeys('bookmarks')
251 247 bookmarkedheads = set()
248
249 # internal config: bookmarks.pushing
250 newbookmarks = [localbookmarks.expandname(b)
251 for b in pushop.ui.configlist('bookmarks', 'pushing')]
252
252 253 for bm in localbookmarks:
253 254 rnode = remotebookmarks.get(bm)
254 255 if rnode and rnode in repo:
@@ -690,7 +690,7 b' pushing a new bookmark on a new head doe'
690 690 $ echo c5 > f2
691 691 $ hg ci -Am5
692 692 created new head
693 $ hg push -B W
693 $ hg push -B .
694 694 pushing to http://localhost:$HGPORT/
695 695 searching for changes
696 696 remote: adding changesets
General Comments 0
You need to be logged in to leave comments. Login now