##// END OF EJS Templates
remotenames: synchronise remotenames after push also...
Pulkit Goyal -
r38634:4d5fb406 default
parent child Browse files
Show More
@@ -531,6 +531,9 b' def push(repo, remote, force=False, revs'
531 _pushobsolete(pushop)
531 _pushobsolete(pushop)
532 _pushbookmark(pushop)
532 _pushbookmark(pushop)
533
533
534 if repo.ui.configbool('experimental', 'remotenames'):
535 logexchange.pullremotenames(repo, remote)
536
534 return pushop
537 return pushop
535
538
536 # list of steps to perform discovery before push
539 # list of steps to perform discovery before push
@@ -339,3 +339,59 b' Local bookmark should take precedence ov'
339 default/bar 6:87d6d6676308
339 default/bar 6:87d6d6676308
340 default/foo 3:62615734edd5
340 default/foo 3:62615734edd5
341 * foo 8:3e1487808078
341 * foo 8:3e1487808078
342
343 Testing the remotenames sychronization during `hg push`
344 -------------------------------------------------------
345
346 $ cd ../server/
347 $ hg bookmark foo
348 moving bookmark 'foo' forward from 62615734edd5
349
350 After the push, default/foo should move to rev 8
351 $ cd ../client/
352 $ hg push
353 pushing to ssh://user@dummy/server
354 searching for changes
355 no changes found
356 [1]
357 $ hg log -Gr 'remotenames()'
358 @ changeset: 8:3e1487808078
359 : branch: wat
360 : bookmark: foo
361 : tag: tip
362 : remote bookmark: default/foo
363 : hoisted name: foo
364 : remote branch: $TESTTMP/server2/wat
365 : remote branch: default/wat
366 : parent: 4:aa98ab95a928
367 : user: test
368 : date: Thu Jan 01 00:00:00 1970 +0000
369 : summary: added bar
370 :
371 : o changeset: 7:ec2426147f0e
372 : | remote branch: $TESTTMP/server2/default
373 : | remote branch: default/default
374 : | user: test
375 : | date: Thu Jan 01 00:00:00 1970 +0000
376 : | summary: Added h
377 : |
378 : o changeset: 6:87d6d6676308
379 :/ remote bookmark: $TESTTMP/server2/bar
380 : remote bookmark: default/bar
381 : hoisted name: bar
382 : user: test
383 : date: Thu Jan 01 00:00:00 1970 +0000
384 : summary: Added g
385 :
386 o changeset: 3:62615734edd5
387 | remote bookmark: $TESTTMP/server2/foo
388 ~ user: test
389 date: Thu Jan 01 00:00:00 1970 +0000
390 summary: Added d
391
392 $ hg bookmarks
393 $TESTTMP/server2/bar 6:87d6d6676308
394 $TESTTMP/server2/foo 3:62615734edd5
395 default/bar 6:87d6d6676308
396 default/foo 8:3e1487808078
397 * foo 8:3e1487808078
General Comments 0
You need to be logged in to leave comments. Login now