comparison tests/test-tutorial.t @ 942:010c7e4aa820

evolve: align working during obsmarker push using pushkey lets use the same wording everywhere to prevent user confusion.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 20 May 2014 13:30:12 -0700
parents 43cceb37324c
children b107f3549ec2
comparison
equal deleted inserted replaced
941:576d3a198269 942:010c7e4aa820
405 adding manifests 405 adding manifests
406 adding file changes 406 adding file changes
407 added 3 changesets with 3 changes to 1 files 407 added 3 changesets with 3 changes to 1 files
408 OBSEXC: computing relevant nodes 408 OBSEXC: computing relevant nodes
409 OBSEXC: computing markers relevant to 5 nodes 409 OBSEXC: computing markers relevant to 5 nodes
410 OBSEXC: encoding 6 markers 410 OBSEXC: pushing 6 markers
411 OBSEXC: sending 1 pushkey payload (609 bytes) 411 OBSEXC: sending 1 pushkey payload (609 bytes)
412 OBSEXC: DONE 412 OBSEXC: DONE
413 413
414 for simplicity sake we get the bathroom change in line again 414 for simplicity sake we get the bathroom change in line again
415 415
739 adding manifests 739 adding manifests
740 adding file changes 740 adding file changes
741 added 2 changesets with 2 changes to 1 files (+1 heads) 741 added 2 changesets with 2 changes to 1 files (+1 heads)
742 OBSEXC: computing relevant nodes 742 OBSEXC: computing relevant nodes
743 OBSEXC: computing markers relevant to 7 nodes 743 OBSEXC: computing markers relevant to 7 nodes
744 OBSEXC: encoding 10 markers 744 OBSEXC: pushing 10 markers
745 OBSEXC: sending 1 pushkey payload (1004 bytes) 745 OBSEXC: sending 1 pushkey payload (1004 bytes)
746 OBSEXC: DONE 746 OBSEXC: DONE
747 747
748 remote get a warning that current working directory is based on an obsolete changeset 748 remote get a warning that current working directory is based on an obsolete changeset
749 749