tests/test-push-warn.t
changeset 12328 b63f6422d2a7
parent 12316 4134686b83e1
child 12365 22f3353bcc36
equal deleted inserted replaced
12327:92e30e135581 12328:b63f6422d2a7
   464   marked working directory as branch B
   464   marked working directory as branch B
   465   $ echo b >b
   465   $ echo b >b
   466   $ hg ci -Amb
   466   $ hg ci -Amb
   467   adding b
   467   adding b
   468 
   468 
   469 # b is now branch head of B, and a topological head
   469 b is now branch head of B, and a topological head
   470 # a is now branch head of A, but not a topological head
   470 a is now branch head of A, but not a topological head
   471 
   471 
   472   $ hg clone . inner
   472   $ hg clone . inner
   473   updating to branch B
   473   updating to branch B
   474   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   474   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   475   $ cd inner
   475   $ cd inner
   477   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   477   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   478   $ echo b1 >b1
   478   $ echo b1 >b1
   479   $ hg ci -Amb1
   479   $ hg ci -Amb1
   480   adding b1
   480   adding b1
   481 
   481 
   482 # in the clone b1 is now the head of B
   482 in the clone b1 is now the head of B
   483 
   483 
   484   $ cd ..
   484   $ cd ..
   485   $ hg up 0
   485   $ hg up 0
   486   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   486   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   487   $ echo a2 >a2
   487   $ echo a2 >a2
   488   $ hg ci -Ama2
   488   $ hg ci -Ama2
   489   adding a2
   489   adding a2
   490 
   490 
   491 # a2 is now the new branch head of A, and a new topological head
   491 a2 is now the new branch head of A, and a new topological head 
   492 # it replaces a former inner branch head, so it should at most warn about A, not B
   492 it replaces a former inner branch head, so it should at most warn about
       
   493 A, not B
   493 
   494 
   494 glog of local:
   495 glog of local:
   495 
   496 
   496   $ hg glog --template "{rev}: {branches} {desc}\n"
   497   $ hg glog --template "{rev}: {branches} {desc}\n"
   497   @  2: A a2
   498   @  2: A a2
   540   marked working directory as branch B
   541   marked working directory as branch B
   541   $ echo b >b
   542   $ echo b >b
   542   $ hg ci -Amb
   543   $ hg ci -Amb
   543   adding b
   544   adding b
   544 
   545 
   545 # b is now branch head of B, and a topological head
   546 b is now branch head of B, and a topological head
   546 
   547 
   547   $ hg up 0
   548   $ hg up 0
   548   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   549   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   549   $ echo a1 >a1
   550   $ echo a1 >a1
   550   $ hg ci -Ama1
   551   $ hg ci -Ama1
   551   adding a1
   552   adding a1
   552 
   553 
   553 # a1 is now branch head of A, and a topological head
   554 a1 is now branch head of A, and a topological head
   554 
   555 
   555   $ hg clone . inner
   556   $ hg clone . inner
   556   updating to branch A
   557   updating to branch A
   557   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   558   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   558   $ cd inner
   559   $ cd inner
   560   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   561   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   561   $ echo b1 >b1
   562   $ echo b1 >b1
   562   $ hg ci -Amb1
   563   $ hg ci -Amb1
   563   adding b1
   564   adding b1
   564 
   565 
   565 # in the clone b1 is now the head of B
   566 in the clone b1 is now the head of B
   566 
   567 
   567   $ cd ..
   568   $ cd ..
   568   $ echo a2 >a2
   569   $ echo a2 >a2
   569   $ hg ci -Ama2
   570   $ hg ci -Ama2
   570   adding a2
   571   adding a2
   571 
   572 
   572 # a2 is now the new branch head of A, and a topological head
   573 a2 is now the new branch head of A, and a topological head
   573 # it replaces a former topological and branch head, so this should not warn
   574 it replaces a former topological and branch head, so this should not warn
   574 
   575 
   575 glog of local:
   576 glog of local:
   576 
   577 
   577   $ hg glog --template "{rev}: {branches} {desc}\n"
   578   $ hg glog --template "{rev}: {branches} {desc}\n"
   578   @  3: A a2
   579   @  3: A a2
   704   $ hg in inner
   705   $ hg in inner
   705   comparing with inner
   706   comparing with inner
   706   searching for changes
   707   searching for changes
   707   no changes found
   708   no changes found
   708   [1]
   709   [1]
   709 
       
   710   $ cd ..
       
   711