tests/test-userguide.t
branchmercurial-3.7
changeset 1797 4de90774eade
parent 1696 898dfca94433
parent 1782 a046e78c3290
equal deleted inserted replaced
1796:2be05515b142 1797:4de90774eade
    74   $ hg --hidden shortlog -G -r 3:
    74   $ hg --hidden shortlog -G -r 3:
    75   x  4:a3e0ef24aaf0  draft  debug hack
    75   x  4:a3e0ef24aaf0  draft  debug hack
    76   |
    76   |
    77   @  3:934359450037  draft  implement feature Y
    77   @  3:934359450037  draft  implement feature Y
    78   |
    78   |
    79   ~
       
    80 
    79 
    81 example 5: uncommit files at head (figure 4)
    80 example 5: uncommit files at head (figure 4)
    82   $ echo 'relevant' >> file1.c
    81   $ echo 'relevant' >> file1.c
    83   $ echo 'irrelevant' >> file2.c
    82   $ echo 'irrelevant' >> file2.c
    84   $ hg commit -u dan -d '10 0' -m 'fix bug 234'
    83   $ hg commit -u dan -d '10 0' -m 'fix bug 234'
    90   |
    89   |
    91   | x  5:da4331967f5f  draft  fix bug 234
    90   | x  5:da4331967f5f  draft  fix bug 234
    92   |/
    91   |/
    93   o  3:934359450037  draft  implement feature Y
    92   o  3:934359450037  draft  implement feature Y
    94   |
    93   |
    95   ~
       
    96   $ hg parents --template '{rev}:{node|short}  {desc|firstline}\n{files}\n'
    94   $ hg parents --template '{rev}:{node|short}  {desc|firstline}\n{files}\n'
    97   6:c8defeecf7a4  fix bug 234
    95   6:c8defeecf7a4  fix bug 234
    98   file1.c
    96   file1.c
    99   $ hg revert --no-backup file2.c
    97   $ hg revert --no-backup file2.c
   100 
    98 
   121   | |
   119   | |
   122   | x  7:05e61aab8294  draft  step 1
   120   | x  7:05e61aab8294  draft  step 1
   123   |/
   121   |/
   124   o  6:c8defeecf7a4  draft  fix bug 234
   122   o  6:c8defeecf7a4  draft  fix bug 234
   125   |
   123   |
   126   ~
       
   127   $ hg --hidden log -q -r 'successors(7) | successors(8) | successors(9)'
   124   $ hg --hidden log -q -r 'successors(7) | successors(8) | successors(9)'
   128   10:171c6a79a27b
   125   10:171c6a79a27b
   129   $ hg --hidden log -q -r 'precursors(10)'
   126   $ hg --hidden log -q -r 'precursors(10)'
   130   7:05e61aab8294
   127   7:05e61aab8294
   131   8:be6d5bc8e4cc
   128   8:be6d5bc8e4cc
   157   |
   154   |
   158   o  11:3e1cb8f70c02  draft  fix bug 17
   155   o  11:3e1cb8f70c02  draft  fix bug 17
   159   |
   156   |
   160   o  10:171c6a79a27b  draft  fix bug 64
   157   o  10:171c6a79a27b  draft  fix bug 64
   161   |
   158   |
   162   ~
       
   163 
   159 
   164 example 7: amend an older changeset (figures 6, 7)
   160 example 7: amend an older changeset (figures 6, 7)
   165   $ hg update -q 11
   161   $ hg update -q 11
   166   $ echo 'fix fix fix fix' > file2.c
   162   $ echo 'fix fix fix fix' > file2.c
   167   $ hg amend -u bob -d '6 0'
   163   $ hg amend -u bob -d '6 0'
   182   | |/
   178   | |/
   183   | x  11:3e1cb8f70c02  draft  fix bug 17
   179   | x  11:3e1cb8f70c02  draft  fix bug 17
   184   |/
   180   |/
   185   o  10:171c6a79a27b  draft  fix bug 64
   181   o  10:171c6a79a27b  draft  fix bug 64
   186   |
   182   |
   187   ~
       
   188   $ hg evolve -q --all
   183   $ hg evolve -q --all
   189   $ hg shortlog -G -r 10::
   184   $ hg shortlog -G -r 10::
   190   @  17:91b4b0f8b5c5  draft  feature 23
   185   @  17:91b4b0f8b5c5  draft  feature 23
   191   |
   186   |
   192   o  16:fe8858bd9bc2  draft  cleanup
   187   o  16:fe8858bd9bc2  draft  cleanup
   193   |
   188   |
   194   o  15:395cbeda3a06  draft  fix bug 17
   189   o  15:395cbeda3a06  draft  fix bug 17
   195   |
   190   |
   196   o  10:171c6a79a27b  draft  fix bug 64
   191   o  10:171c6a79a27b  draft  fix bug 64
   197   |
   192   |
   198   ~
       
   199 
   193 
   200 setup for example 8: prune an older changeset (figure 8)
   194 setup for example 8: prune an older changeset (figure 8)
   201   $ echo 'useful' >> file1.c
   195   $ echo 'useful' >> file1.c
   202   $ hg commit -u carl -d '7 0' -m 'useful work'
   196   $ hg commit -u carl -d '7 0' -m 'useful work'
   203   $ echo 'debug' >> file2.c
   197   $ echo 'debug' >> file2.c
   211   |
   205   |
   212   o  18:1f33e68b18b9  draft  useful work
   206   o  18:1f33e68b18b9  draft  useful work
   213   |
   207   |
   214   o  17:91b4b0f8b5c5  draft  feature 23
   208   o  17:91b4b0f8b5c5  draft  feature 23
   215   |
   209   |
   216   ~
       
   217 
   210 
   218 example 8: prune an older changeset (figures 8, 9)
   211 example 8: prune an older changeset (figures 8, 9)
   219   $ hg prune 19
   212   $ hg prune 19
   220   1 changesets pruned
   213   1 changesets pruned
   221   1 new unstable changesets
   214   1 new unstable changesets
   224   |
   217   |
   225   x  19:b23d06b457a8  draft  debug hack
   218   x  19:b23d06b457a8  draft  debug hack
   226   |
   219   |
   227   o  18:1f33e68b18b9  draft  useful work
   220   o  18:1f33e68b18b9  draft  useful work
   228   |
   221   |
   229   ~
       
   230   $ hg evolve -q --all --any
   222   $ hg evolve -q --all --any
   231   $ hg --hidden shortlog -G -r 18::
   223   $ hg --hidden shortlog -G -r 18::
   232   @  21:4393e5877437  draft  more work
   224   @  21:4393e5877437  draft  more work
   233   |
   225   |
   234   | x  20:ea8fafca914b  draft  more work
   226   | x  20:ea8fafca914b  draft  more work
   235   | |
   227   | |
   236   | x  19:b23d06b457a8  draft  debug hack
   228   | x  19:b23d06b457a8  draft  debug hack
   237   |/
   229   |/
   238   o  18:1f33e68b18b9  draft  useful work
   230   o  18:1f33e68b18b9  draft  useful work
   239   |
   231   |
   240   ~
       
   241 
   232 
   242 example 9: uncommit files from an older changeset (discard changes)
   233 example 9: uncommit files from an older changeset (discard changes)
   243 (figure 10)
   234 (figure 10)
   244   $ echo 'this fixes bug 53' >> file1.c
   235   $ echo 'this fixes bug 53' >> file1.c
   245   $ echo 'debug hack' >> file2.c
   236   $ echo 'debug hack' >> file2.c
   253   |
   244   |
   254   @  22:f84357446753  draft  fix bug 53
   245   @  22:f84357446753  draft  fix bug 53
   255   |
   246   |
   256   o  21:4393e5877437  draft  more work
   247   o  21:4393e5877437  draft  more work
   257   |
   248   |
   258   ~
       
   259   $ hg uncommit file2.c
   249   $ hg uncommit file2.c
   260   1 new unstable changesets
   250   1 new unstable changesets
   261   $ hg status
   251   $ hg status
   262   M file2.c
   252   M file2.c
   263   $ hg revert file2.c
   253   $ hg revert file2.c
   274   | |
   264   | |
   275   | x  22:f84357446753  draft  fix bug 53
   265   | x  22:f84357446753  draft  fix bug 53
   276   |/
   266   |/
   277   o  21:4393e5877437  draft  more work
   267   o  21:4393e5877437  draft  more work
   278   |
   268   |
   279   ~
       
   280   $ rm file2.c.orig
   269   $ rm file2.c.orig
   281 
   270 
   282 example 10: uncommit files from an older changeset (keep changes)
   271 example 10: uncommit files from an older changeset (keep changes)
   283 (figures 11, 12)
   272 (figures 11, 12)
   284   $ echo 'fix a bug' >> file1.c
   273   $ echo 'fix a bug' >> file1.c
   293   |
   282   |
   294   @  26:5b31a1239ab9  draft  fix a bug
   283   @  26:5b31a1239ab9  draft  fix a bug
   295   |
   284   |
   296   o  25:0d972d6888e6  draft  fix bug 67
   285   o  25:0d972d6888e6  draft  fix bug 67
   297   |
   286   |
   298   ~
       
   299   $ hg uncommit file2.c
   287   $ hg uncommit file2.c
   300   1 new unstable changesets
   288   1 new unstable changesets
   301   $ hg status
   289   $ hg status
   302   M file2.c
   290   M file2.c
   303   $ hg commit -m 'useful tweak'
   291   $ hg commit -m 'useful tweak'
   310   | |
   298   | |
   311   | x  26:5b31a1239ab9  draft  fix a bug
   299   | x  26:5b31a1239ab9  draft  fix a bug
   312   |/
   300   |/
   313   o  25:0d972d6888e6  draft  fix bug 67
   301   o  25:0d972d6888e6  draft  fix bug 67
   314   |
   302   |
   315   ~
       
   316   $ hg evolve --all --any
   303   $ hg evolve --all --any
   317   move:[27] new feature
   304   move:[27] new feature
   318   atop:[28] fix a bug
   305   atop:[28] fix a bug
   319   working directory is now at 166c1c368ab6
   306   working directory is now at 166c1c368ab6
   320   $ hg --hidden shortlog -G -r 25::
   307   $ hg --hidden shortlog -G -r 25::
   328   | |
   315   | |
   329   | x  26:5b31a1239ab9  draft  fix a bug
   316   | x  26:5b31a1239ab9  draft  fix a bug
   330   |/
   317   |/
   331   o  25:0d972d6888e6  draft  fix bug 67
   318   o  25:0d972d6888e6  draft  fix bug 67
   332   |
   319   |
   333   ~