tests/test-evolve-obshistory-complex.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Fri, 14 Sep 2018 10:51:44 +0200
branchmercurial-4.3
changeset 4114 2aa2a8780a10
parent 3716 e5ba6531503e
permissions -rw-r--r--
test-compat: merge mercurial-4.4 into mercurial-4.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     1
Global setup
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     2
============
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     3
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     4
  $ . $TESTDIR/testlib/common.sh
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     5
  $ cat >> $HGRCPATH <<EOF
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     6
  > [ui]
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     7
  > interactive = true
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     8
  > [phases]
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     9
  > publish=False
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    10
  > [extensions]
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    11
  > evolve =
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    12
  > EOF
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    13
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    14
Test obslog with split + fold + split
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    15
=====================================
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    16
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    17
Test setup
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    18
----------
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    19
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    20
  $ hg init $TESTTMP/splitfoldsplit
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    21
  $ cd $TESTTMP/splitfoldsplit
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    22
  $ mkcommit ROOT
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    23
  $ mkcommit A
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    24
  $ mkcommit B
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    25
  $ mkcommit C
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    26
  $ mkcommit D
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    27
  $ mkcommit E
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    28
  $ mkcommit F
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    29
  $ hg log -G
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    30
  @  changeset:   6:d9f908fde1a1
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    31
  |  tag:         tip
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    32
  |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    33
  |  date:        Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    34
  |  summary:     F
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    35
  |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    36
  o  changeset:   5:0da815c333f6
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    37
  |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    38
  |  date:        Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    39
  |  summary:     E
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    40
  |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    41
  o  changeset:   4:868d2e0eb19c
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    42
  |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    43
  |  date:        Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    44
  |  summary:     D
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    45
  |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    46
  o  changeset:   3:a8df460dbbfe
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    47
  |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    48
  |  date:        Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    49
  |  summary:     C
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    50
  |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    51
  o  changeset:   2:c473644ee0e9
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    52
  |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    53
  |  date:        Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    54
  |  summary:     B
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    55
  |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    56
  o  changeset:   1:2a34000d3544
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    57
  |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    58
  |  date:        Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    59
  |  summary:     A
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    60
  |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    61
  o  changeset:   0:ea207398892e
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    62
     user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    63
     date:        Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    64
     summary:     ROOT
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    65
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    66
Split commits two by two
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    67
------------------------
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    68
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    69
  $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0"
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    70
  2 changesets folded
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3098
diff changeset
    71
  4 new unstable changesets
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    72
  $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1"
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    73
  2 changesets folded
3219
b73bd280b21c fold: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3217
diff changeset
    74
  $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test"
3287
4303a46b4167 test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3223 3106
diff changeset
    75
  current hg version does not support storing note in obsmarker
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    76
  2 changesets folded
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    77
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3219
b73bd280b21c fold: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3217
diff changeset
    78
  $ hg obslog -r .
b73bd280b21c fold: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3217
diff changeset
    79
  @    100cc25b765f (9) fold2
b73bd280b21c fold: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3217
diff changeset
    80
  |\
b73bd280b21c fold: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3217
diff changeset
    81
  x |  0da815c333f6 (5) E
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
    82
   /     rewritten(description, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
3223
73b4e84df0bd obsnote: don't add '' to note while showing it in obslog
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3219
diff changeset
    83
  |        note: folding changesets to test
3219
b73bd280b21c fold: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3217
diff changeset
    84
  |
b73bd280b21c fold: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3217
diff changeset
    85
  x  d9f908fde1a1 (6) F
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
    86
       rewritten(description, parent, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
3223
73b4e84df0bd obsnote: don't add '' to note while showing it in obslog
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3219
diff changeset
    87
         note: folding changesets to test
3219
b73bd280b21c fold: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3217
diff changeset
    88
  
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    89
  $ hg log -G 
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    90
  @  changeset:   9:100cc25b765f
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    91
  |  tag:         tip
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    92
  |  parent:      4:868d2e0eb19c
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    93
  |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    94
  |  date:        Thu Jan 01 00:00:00 1970 +0000
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3098
diff changeset
    95
  |  trouble:     unstable
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    96
  |  summary:     fold2
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    97
  |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3359
diff changeset
    98
  | o  changeset:   8:d15d0ffc75f6
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    99
  | |  parent:      2:c473644ee0e9
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   100
  | |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   101
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3098
diff changeset
   102
  | |  trouble:     unstable
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   103
  | |  summary:     fold1
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   104
  | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   105
  | | o  changeset:   7:b868bc49b0a4
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   106
  | | |  parent:      0:ea207398892e
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   107
  | | |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   108
  | | |  date:        Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   109
  | | |  summary:     fold0
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   110
  | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   111
  x | |  changeset:   4:868d2e0eb19c
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   112
  | | |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   113
  | | |  date:        Thu Jan 01 00:00:00 1970 +0000
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   114
  | | |  obsolete:    rewritten as d15d0ffc75f6
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   115
  | | |  summary:     D
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   116
  | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   117
  x | |  changeset:   3:a8df460dbbfe
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   118
  |/ /   user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   119
  | |    date:        Thu Jan 01 00:00:00 1970 +0000
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   120
  | |    obsolete:    rewritten as d15d0ffc75f6
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   121
  | |    summary:     C
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   122
  | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   123
  x |  changeset:   2:c473644ee0e9
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   124
  | |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   125
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   126
  | |  obsolete:    rewritten as b868bc49b0a4
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   127
  | |  summary:     B
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   128
  | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   129
  x |  changeset:   1:2a34000d3544
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   130
  |/   user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   131
  |    date:        Thu Jan 01 00:00:00 1970 +0000
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   132
  |    obsolete:    rewritten as b868bc49b0a4
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   133
  |    summary:     A
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   134
  |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   135
  o  changeset:   0:ea207398892e
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   136
     user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   137
     date:        Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   138
     summary:     ROOT
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   139
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   140
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   141
Then split
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   142
----------
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   143
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   144
  $ hg split "desc(fold0)" -d "0 0" << EOF
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   145
  > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   146
  > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   147
  > N
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   148
  > N
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   149
  > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   150
  > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   151
  > EOF
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   152
  0 files updated, 0 files merged, 6 files removed, 0 files unresolved
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   153
  adding A
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   154
  adding B
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   155
  diff --git a/A b/A
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   156
  new file mode 100644
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   157
  examine changes to 'A'? [Ynesfdaq?] Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   158
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   159
  @@ -0,0 +1,1 @@
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   160
  +A
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   161
  record change 1/2 to 'A'? [Ynesfdaq?] Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   162
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   163
  diff --git a/B b/B
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   164
  new file mode 100644
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   165
  examine changes to 'B'? [Ynesfdaq?] N
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   166
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   167
  created new head
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   168
  Done splitting? [yN] N
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   169
  diff --git a/B b/B
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   170
  new file mode 100644
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   171
  examine changes to 'B'? [Ynesfdaq?] Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   172
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   173
  @@ -0,0 +1,1 @@
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   174
  +B
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   175
  record this change to 'B'? [Ynesfdaq?] Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   176
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   177
  no more change to split
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   178
  $ hg split "desc(fold1)" -d "0 0" << EOF
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   179
  > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   180
  > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   181
  > N
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   182
  > N
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   183
  > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   184
  > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   185
  > EOF
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   186
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   187
  adding C
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   188
  adding D
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   189
  diff --git a/C b/C
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   190
  new file mode 100644
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   191
  examine changes to 'C'? [Ynesfdaq?] Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   192
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   193
  @@ -0,0 +1,1 @@
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   194
  +C
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   195
  record change 1/2 to 'C'? [Ynesfdaq?] Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   196
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   197
  diff --git a/D b/D
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   198
  new file mode 100644
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   199
  examine changes to 'D'? [Ynesfdaq?] N
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   200
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   201
  created new head
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   202
  Done splitting? [yN] N
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   203
  diff --git a/D b/D
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   204
  new file mode 100644
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   205
  examine changes to 'D'? [Ynesfdaq?] Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   206
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   207
  @@ -0,0 +1,1 @@
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   208
  +D
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   209
  record this change to 'D'? [Ynesfdaq?] Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   210
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   211
  no more change to split
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   212
  $ hg split "desc(fold2)" -d "0 0" << EOF
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   213
  > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   214
  > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   215
  > N
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   216
  > N
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   217
  > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   218
  > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   219
  > EOF
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   220
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   221
  adding E
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   222
  adding F
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   223
  diff --git a/E b/E
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   224
  new file mode 100644
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   225
  examine changes to 'E'? [Ynesfdaq?] Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   226
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   227
  @@ -0,0 +1,1 @@
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   228
  +E
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   229
  record change 1/2 to 'E'? [Ynesfdaq?] Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   230
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   231
  diff --git a/F b/F
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   232
  new file mode 100644
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   233
  examine changes to 'F'? [Ynesfdaq?] N
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   234
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   235
  created new head
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   236
  Done splitting? [yN] N
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   237
  diff --git a/F b/F
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   238
  new file mode 100644
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   239
  examine changes to 'F'? [Ynesfdaq?] Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   240
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   241
  @@ -0,0 +1,1 @@
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   242
  +F
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   243
  record this change to 'F'? [Ynesfdaq?] Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   244
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   245
  no more change to split
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   246
  $ hg log -G
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   247
  @  changeset:   15:d4a000f63ee9
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   248
  |  tag:         tip
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   249
  |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   250
  |  date:        Thu Jan 01 00:00:00 1970 +0000
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3098
diff changeset
   251
  |  trouble:     unstable
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   252
  |  summary:     fold2
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   253
  |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3359
diff changeset
   254
  o  changeset:   14:ec31316faa9d
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   255
  |  parent:      4:868d2e0eb19c
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   256
  |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   257
  |  date:        Thu Jan 01 00:00:00 1970 +0000
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3098
diff changeset
   258
  |  trouble:     unstable
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   259
  |  summary:     fold2
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   260
  |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3359
diff changeset
   261
  | o  changeset:   13:d0f33db50670
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   262
  | |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   263
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3098
diff changeset
   264
  | |  trouble:     unstable
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   265
  | |  summary:     fold1
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   266
  | |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3359
diff changeset
   267
  | o  changeset:   12:7b3290f6e0a0
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   268
  | |  parent:      2:c473644ee0e9
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   269
  | |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   270
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3098
diff changeset
   271
  | |  trouble:     unstable
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   272
  | |  summary:     fold1
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   273
  | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   274
  | | o  changeset:   11:e036916b63ea
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   275
  | | |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   276
  | | |  date:        Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   277
  | | |  summary:     fold0
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   278
  | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   279
  | | o  changeset:   10:19e14c8397fc
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   280
  | | |  parent:      0:ea207398892e
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   281
  | | |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   282
  | | |  date:        Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   283
  | | |  summary:     fold0
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   284
  | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   285
  x | |  changeset:   4:868d2e0eb19c
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   286
  | | |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   287
  | | |  date:        Thu Jan 01 00:00:00 1970 +0000
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   288
  | | |  obsolete:    split as 7b3290f6e0a0, d0f33db50670
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   289
  | | |  summary:     D
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   290
  | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   291
  x | |  changeset:   3:a8df460dbbfe
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   292
  |/ /   user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   293
  | |    date:        Thu Jan 01 00:00:00 1970 +0000
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   294
  | |    obsolete:    split as 7b3290f6e0a0, d0f33db50670
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   295
  | |    summary:     C
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   296
  | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   297
  x |  changeset:   2:c473644ee0e9
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   298
  | |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   299
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   300
  | |  obsolete:    split as 19e14c8397fc, e036916b63ea
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   301
  | |  summary:     B
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   302
  | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   303
  x |  changeset:   1:2a34000d3544
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   304
  |/   user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   305
  |    date:        Thu Jan 01 00:00:00 1970 +0000
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   306
  |    obsolete:    split as 19e14c8397fc, e036916b63ea
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   307
  |    summary:     A
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   308
  |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   309
  o  changeset:   0:ea207398892e
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   310
     user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   311
     date:        Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   312
     summary:     ROOT
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   313
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   314
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   315
Connect them all
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   316
----------------
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   317
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   318
  $ hg prune -s 12 -r 11
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   319
  1 changesets pruned
3217
b6ba296532cb prune: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3083
diff changeset
   320
  $ hg prune -s 14 -r 13 -n "this is a note stored in obsmarker in prune"
3287
4303a46b4167 test-compat: merge stable into mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3223 3106
diff changeset
   321
  current hg version does not support storing note in obsmarker
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   322
  1 changesets pruned
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   323
  $ hg log -G
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   324
  @  changeset:   15:d4a000f63ee9
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   325
  |  tag:         tip
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   326
  |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   327
  |  date:        Thu Jan 01 00:00:00 1970 +0000
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3098
diff changeset
   328
  |  trouble:     unstable
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   329
  |  summary:     fold2
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   330
  |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3359
diff changeset
   331
  o  changeset:   14:ec31316faa9d
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   332
  |  parent:      4:868d2e0eb19c
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   333
  |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   334
  |  date:        Thu Jan 01 00:00:00 1970 +0000
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3098
diff changeset
   335
  |  trouble:     unstable
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   336
  |  summary:     fold2
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   337
  |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3359
diff changeset
   338
  | o  changeset:   12:7b3290f6e0a0
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   339
  | |  parent:      2:c473644ee0e9
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   340
  | |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   341
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
3106
a867d59ea97a test-compat: revert output changes from phase renaming
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3098
diff changeset
   342
  | |  trouble:     unstable
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   343
  | |  summary:     fold1
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   344
  | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   345
  | | o  changeset:   10:19e14c8397fc
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   346
  | | |  parent:      0:ea207398892e
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   347
  | | |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   348
  | | |  date:        Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   349
  | | |  summary:     fold0
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   350
  | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   351
  x | |  changeset:   4:868d2e0eb19c
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   352
  | | |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   353
  | | |  date:        Thu Jan 01 00:00:00 1970 +0000
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   354
  | | |  obsolete:    split as 7b3290f6e0a0, ec31316faa9d
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   355
  | | |  summary:     D
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   356
  | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   357
  x | |  changeset:   3:a8df460dbbfe
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   358
  |/ /   user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   359
  | |    date:        Thu Jan 01 00:00:00 1970 +0000
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   360
  | |    obsolete:    split as 7b3290f6e0a0, ec31316faa9d
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   361
  | |    summary:     C
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   362
  | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   363
  x |  changeset:   2:c473644ee0e9
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   364
  | |  user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   365
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   366
  | |  obsolete:    split as 19e14c8397fc, 7b3290f6e0a0
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   367
  | |  summary:     B
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   368
  | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   369
  x |  changeset:   1:2a34000d3544
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   370
  |/   user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   371
  |    date:        Thu Jan 01 00:00:00 1970 +0000
3098
87b83a3e0392 test-compat: revert output change from using core obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   372
  |    obsolete:    split as 19e14c8397fc, 7b3290f6e0a0
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   373
  |    summary:     A
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   374
  |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   375
  o  changeset:   0:ea207398892e
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   376
     user:        test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   377
     date:        Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   378
     summary:     ROOT
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   379
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   380
Actual Test
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   381
===========
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   382
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   383
Obslog should show a subset of the obs history, this test check that the
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   384
walking algorithm works no matter the level of successors + precursors
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   385
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   386
  $ hg obslog 12
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3359
diff changeset
   387
  o    7b3290f6e0a0 (12) fold1
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   388
  |\
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   389
  x |    d15d0ffc75f6 (8) fold1
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   390
  |\ \     rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   391
  | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   392
  | | x  e036916b63ea (11) fold0
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   393
  | | |    rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   394
  | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   395
  x | |  868d2e0eb19c (4) D
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   396
   / /     rewritten(description, parent, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   397
  | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   398
  x |  a8df460dbbfe (3) C
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   399
   /     rewritten(description, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   400
  |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   401
  x    b868bc49b0a4 (7) fold0
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   402
  |\     rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   403
  | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   404
  x |  2a34000d3544 (1) A
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   405
   /     rewritten(description, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   406
  |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   407
  x  c473644ee0e9 (2) B
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   408
       rewritten(description, parent, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   409
  
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   410
While with all option, we should see 15 changesets
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   411
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   412
  $ hg obslog --all 15
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   413
  o  19e14c8397fc (10) fold0
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   414
  |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3359
diff changeset
   415
  | o    7b3290f6e0a0 (12) fold1
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   416
  | |\
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   417
  | | | @  d4a000f63ee9 (15) fold2
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   418
  | | | |
3411
e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3359
diff changeset
   419
  | | | | o  ec31316faa9d (14) fold2
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   420
  | | | |/|
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   421
  | | | x |    100cc25b765f (9) fold2
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   422
  | | | |\ \     rewritten(parent, content) as d4a000f63ee9, ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   423
  | | | | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   424
  | +-------x  d0f33db50670 (13) fold1
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   425
  | | | | |      rewritten(description, parent, content) as ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000)
3223
73b4e84df0bd obsnote: don't add '' to note while showing it in obslog
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3219
diff changeset
   426
  | | | | |        note: this is a note stored in obsmarker in prune
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   427
  | | | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   428
  +---x | |  e036916b63ea (11) fold0
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   429
  | |  / /     rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   430
  | | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   431
  | | x |  0da815c333f6 (5) E
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   432
  | |  /     rewritten(description, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
3223
73b4e84df0bd obsnote: don't add '' to note while showing it in obslog
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3219
diff changeset
   433
  | | |        note: folding changesets to test
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   434
  | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   435
  x | |    b868bc49b0a4 (7) fold0
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   436
  |\ \ \     rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   437
  | | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   438
  | | x |    d15d0ffc75f6 (8) fold1
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   439
  | | |\ \     rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   440
  | | | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   441
  | | | | x  d9f908fde1a1 (6) F
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   442
  | | | |      rewritten(description, parent, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
3223
73b4e84df0bd obsnote: don't add '' to note while showing it in obslog
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3219
diff changeset
   443
  | | | |        note: folding changesets to test
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   444
  | | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   445
  x | | |  2a34000d3544 (1) A
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   446
   / / /     rewritten(description, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   447
  | | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   448
  | x |  868d2e0eb19c (4) D
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   449
  |  /     rewritten(description, parent, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   450
  | |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   451
  | x  a8df460dbbfe (3) C
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   452
  |      rewritten(description, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   453
  |
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   454
  x  c473644ee0e9 (2) B
3716
e5ba6531503e testcompat: update output for Mercurial 4.3
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3591
diff changeset
   455
       rewritten(description, parent, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
2484
262d684851dc obshistory: add the all option to obslog to show the while obs tree
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   456