tests/test-topic-flow-reject-untopiced.t
changeset 3280 e642bad8174a
parent 3235 8a772f0c54d9
child 4840 62b60fc1983d
equal deleted inserted replaced
3279:4a9718a83602 3280:e642bad8174a
    15   > EOF
    15   > EOF
    16 
    16 
    17   $ hg topic server
    17   $ hg topic server
    18   marked working directory as topic: server
    18   marked working directory as topic: server
    19   $ for ch in a b c; do echo foo > $ch; hg ci -Aqm "Added "$ch; done
    19   $ for ch in a b c; do echo foo > $ch; hg ci -Aqm "Added "$ch; done
       
    20   $ hg ph -p 0
    20 
    21 
    21   $ hg log -G -T "{rev}:{node|short}\n{desc}  {topics}"
    22   $ hg log -G -T "{rev}:{node|short}\n{desc}  {topics}"
    22   @  2:a7b96f87a214
    23   @  2:a7b96f87a214
    23   |  Added c  server
    24   |  Added c  server
    24   o  1:d6a8197e192a
    25   o  1:d6a8197e192a
    25   |  Added b  server
    26   |  Added b  server
    26   o  0:49a3f206c9ae
    27   o  0:49a3f206c9ae
    27      Added a  server
    28      Added a
    28 
    29 
    29   $ cd ..
    30   $ cd ..
    30 
    31 
    31 Creating a client repo
    32 Creating a client repo
    32 
    33 
    33   $ hg clone server client
    34   $ hg clone server client
    34   updating to branch default
    35   updating to branch default
       
    36   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    37   $ cd client
       
    38   $ hg up server
    35   switching to topic server
    39   switching to topic server
    36   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
    40   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
    37   $ cd client
       
    38   $ hg log -G -T "{rev}:{node|short}\n{desc}  {topics}"
    41   $ hg log -G -T "{rev}:{node|short}\n{desc}  {topics}"
    39   @  2:a7b96f87a214
    42   @  2:a7b96f87a214
    40   |  Added c  server
    43   |  Added c  server
    41   o  1:d6a8197e192a
    44   o  1:d6a8197e192a
    42   |  Added b  server
    45   |  Added b  server
    43   o  0:49a3f206c9ae
    46   o  0:49a3f206c9ae
    44      Added a  server
    47      Added a
    45 
    48 
    46   $ hg topic
    49   $ hg topic
    47    * server (3 changesets)
    50    * server (2 changesets)
    48 
    51 
    49 Create a changeset without topic
    52 Create a changeset without topic
    50 
    53 
    51   $ hg topic --clear
    54   $ hg topic --clear
    52   $ echo foo > d
    55   $ echo foo > d
    58   o  2:a7b96f87a214
    61   o  2:a7b96f87a214
    59   |  Added c  server
    62   |  Added c  server
    60   o  1:d6a8197e192a
    63   o  1:d6a8197e192a
    61   |  Added b  server
    64   |  Added b  server
    62   o  0:49a3f206c9ae
    65   o  0:49a3f206c9ae
    63      Added a  server
    66      Added a
    64 
    67 
    65 Push a draft changeset without topic
    68 Push a draft changeset without topic
    66 
    69 
    67   $ hg push ../server  --new-branch
    70   $ hg push ../server  --new-branch
    68   pushing to ../server
    71   pushing to ../server
   106   o  2:a7b96f87a214
   109   o  2:a7b96f87a214
   107   |  Added c  server
   110   |  Added c  server
   108   o  1:d6a8197e192a
   111   o  1:d6a8197e192a
   109   |  Added b  server
   112   |  Added b  server
   110   o  0:49a3f206c9ae
   113   o  0:49a3f206c9ae
   111      Added a  server
   114      Added a
   112 
   115 
   113 Pushing multiple changeset with some having topics and some not
   116 Pushing multiple changeset with some having topics and some not
   114 
   117 
   115   $ hg push ../server --new-branch
   118   $ hg push ../server --new-branch
   116   pushing to ../server
   119   pushing to ../server