tests/test-stabilize-order.t
branchmercurial-4.4
changeset 4363 a2fdbece7ce1
parent 3714 19ec729f3ca2
child 4675 79bc0f1a832e
equal deleted inserted replaced
4362:8bd60e09dfb4 4363:a2fdbece7ce1
    36   gdown have been deprecated in favor of previous
    36   gdown have been deprecated in favor of previous
    37   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    37   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    38   [2] addb
    38   [2] addb
    39   $ echo b >> b
    39   $ echo b >> b
    40   $ hg amend
    40   $ hg amend
    41   1 new orphan changesets
       
    42   $ hg gdown
    41   $ hg gdown
    43   gdown have been deprecated in favor of previous
    42   gdown have been deprecated in favor of previous
    44   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    43   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    45   [1] adda
    44   [1] adda
    46   $ echo a >> a
    45   $ echo a >> a
    47   $ hg amend
    46   $ hg amend
    48   1 new orphan changesets
       
    49   $ glog
    47   $ glog
    50   @  5:005fe5914f78@default(draft) adda
    48   @  5:005fe5914f78@default(draft) adda
    51   |
    49   |
    52   | *  4:22619daeed78@default(draft) addb
    50   | o  4:22619daeed78@default(draft) addb
    53   | |
    51   | |
    54   | | *  3:7a7552255fb5@default(draft) addc
    52   | | o  3:7a7552255fb5@default(draft) addc
    55   | | |
    53   | | |
    56   | | x  2:ef23d6ef94d6@default(draft) addb
    54   | | x  2:ef23d6ef94d6@default(draft) addb
    57   | |/
    55   | |/
    58   | x  1:93418d2c0979@default(draft) adda
    56   | x  1:93418d2c0979@default(draft) adda
    59   |/
    57   |/
    76   $ glog
    74   $ glog
    77   @  6:81b8bbcd5892@default(draft) addb
    75   @  6:81b8bbcd5892@default(draft) addb
    78   |
    76   |
    79   o  5:005fe5914f78@default(draft) adda
    77   o  5:005fe5914f78@default(draft) adda
    80   |
    78   |
    81   | *  3:7a7552255fb5@default(draft) addc
    79   | o  3:7a7552255fb5@default(draft) addc
    82   | |
    80   | |
    83   | x  2:ef23d6ef94d6@default(draft) addb
    81   | x  2:ef23d6ef94d6@default(draft) addb
    84   | |
    82   | |
    85   | x  1:93418d2c0979@default(draft) adda
    83   | x  1:93418d2c0979@default(draft) adda
    86   |/
    84   |/
   134 
   132 
   135   $ hg up 81b8bbcd5892
   133   $ hg up 81b8bbcd5892
   136   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   134   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   137   $ echo b >> b
   135   $ echo b >> b
   138   $ hg amend
   136   $ hg amend
   139   1 new orphan changesets
       
   140   $ glog
   137   $ glog
   141   @  8:7a68bc4596ea@default(draft) addb
   138   @  8:7a68bc4596ea@default(draft) addb
   142   |
   139   |
   143   | *  7:0f691739f917@default(draft) addc
   140   | o  7:0f691739f917@default(draft) addc
   144   | |
   141   | |
   145   | x  6:81b8bbcd5892@default(draft) addb
   142   | x  6:81b8bbcd5892@default(draft) addb
   146   |/
   143   |/
   147   o  5:005fe5914f78@default(draft) adda
   144   o  5:005fe5914f78@default(draft) adda
   148   |
   145   |
   192   $ hg ci -m secondambiguous
   189   $ hg ci -m secondambiguous
   193   created new head
   190   created new head
   194   $ hg up .^
   191   $ hg up .^
   195   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   192   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   196   $ hg commit --amend -m "newmessage"
   193   $ hg commit --amend -m "newmessage"
   197   2 new orphan changesets
       
   198   $ hg log -G
   194   $ hg log -G
   199   @  changeset:   12:f83a0bce03e4
   195   @  changeset:   12:f83a0bce03e4
   200   |  tag:         tip
   196   |  tag:         tip
   201   |  parent:      8:7a68bc4596ea
   197   |  parent:      8:7a68bc4596ea
   202   |  user:        test
   198   |  user:        test
   203   |  date:        Thu Jan 01 00:00:00 1970 +0000
   199   |  date:        Thu Jan 01 00:00:00 1970 +0000
   204   |  summary:     newmessage
   200   |  summary:     newmessage
   205   |
   201   |
   206   | *  changeset:   11:fa68011f392e
   202   | o  changeset:   11:fa68011f392e
   207   | |  parent:      9:2256dae6521f
   203   | |  parent:      9:2256dae6521f
   208   | |  user:        test
   204   | |  user:        test
   209   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   205   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   210   | |  instability: orphan
   206   | |  instability: orphan
   211   | |  summary:     secondambiguous
   207   | |  summary:     secondambiguous
   212   | |
   208   | |
   213   | | *  changeset:   10:bdc003b6eec2
   209   | | o  changeset:   10:bdc003b6eec2
   214   | |/   user:        test
   210   | |/   user:        test
   215   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   211   | |    date:        Thu Jan 01 00:00:00 1970 +0000
   216   | |    instability: orphan
   212   | |    instability: orphan
   217   | |    summary:     firstambiguous
   213   | |    summary:     firstambiguous
   218   | |
   214   | |