tests/test-evolve-templates.t
author Anton Shestakov <av6@dwimlabs.net>
Fri, 08 May 2020 22:18:15 +0800
branchmercurial-4.7
changeset 5367 cb5983c0287f
parent 5162 a7fb433faab6
parent 5364 be5aa681c122
child 5368 844b1ad5b34b
permissions -rw-r--r--
test-compat: merge mercurial-4.8 into mercurial-4.7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
     1
This test file test the various templates for predecessors and successors.
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     3
Global setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     4
============
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     5
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     6
  $ . $TESTDIR/testlib/common.sh
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     7
  $ cat >> $HGRCPATH <<EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     8
  > [ui]
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     9
  > interactive = true
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    10
  > [phases]
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    11
  > publish=False
5079
1f92a6aa40d6 evolve: add pre-check logic for content-divergence in rewriteutil.precheck()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5054
diff changeset
    12
  > [experimental]
1f92a6aa40d6 evolve: add pre-check logic for content-divergence in rewriteutil.precheck()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5054
diff changeset
    13
  > evolution.allowdivergence = True
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    14
  > [extensions]
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    15
  > evolve =
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    16
  > [alias]
2497
1e9b86ed78c9 template: make the template definition more manageable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2496
diff changeset
    17
  > tlog = log -G -T '{node|short}\
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
    18
  >     {if(predecessors, "\n  Predecessors: {predecessors}")}\
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
    19
  >     {if(predecessors, "\n  semi-colon: {join(predecessors, "; ")}")}\
2498
b765650b37ee template: skip "successors" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2497
diff changeset
    20
  >     {if(successors, "\n  Successors: {successors}")}\
2502
d5db7464676d template: update successors template output
Boris Feld <boris.feld@octobus.net>
parents: 2500
diff changeset
    21
  >     {if(successors, "\n  semi-colon: {join(successors, "; ")}")}\
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
    22
  >     {if(obsfate, "{obsfate % "\n  Fate: {fate}"}")}\
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
    23
  >     {if(obsorigin, "{obsorigin % "\n  Origin: {origin}"}")}\n\n'
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
    24
  > fateoriginlog = log -G -T '{node|short}\
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
    25
  >     {if(obsfate, "\n  Obsfate: {join(obsfate, "; ")}")}\
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
    26
  >     {if(obsorigin, "\n  Obsorigin: {join(obsorigin, "; ")}")}\n\n'
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    27
  > EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    28
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    29
Test templates on amended commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    30
================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    31
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    32
Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    33
----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    34
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    35
  $ hg init $TESTTMP/templates-local-amend
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    36
  $ cd $TESTTMP/templates-local-amend
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    37
  $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    38
  $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    39
  $ echo 42 >> A0
3049
02c4a0b550ab obsfate: update test
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
    40
  $ HGUSER=test hg amend -m "A1" --config devel.default-date="1234567890 0"
2589
8412b0b7b512 obsfate: build more advanced markers for tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2555
diff changeset
    41
  $ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0"
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    42
  $ hg log --hidden -G
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
    43
  @  changeset:   3:d004c8f274b9
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    44
  |  tag:         tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    45
  |  parent:      0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    46
  |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    47
  |  date:        Thu Jan 01 00:00:00 1970 +0000
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
    48
  |  summary:     A2
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
    49
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
    50
  | x  changeset:   2:a468dc9b3633
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
    51
  |/   parent:      0:ea207398892e
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
    52
  |    user:        test
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
    53
  |    date:        Thu Jan 01 00:00:00 1970 +0000
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
    54
  |    obsolete:    reworded using amend as 3:d004c8f274b9 by test2
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
    55
  |    summary:     A1
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    56
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    57
  | x  changeset:   1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    58
  |/   user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    59
  |    date:        Thu Jan 01 00:00:00 1970 +0000
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
    60
  |    obsolete:    rewritten using amend as 2:a468dc9b3633
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    61
  |    summary:     A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    62
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    63
  o  changeset:   0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    64
     user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    65
     date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    66
     summary:     ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    67
  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    68
Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    69
---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    70
  $ hg up 'desc(A0)' --hidden
3747
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
    71
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
    72
  updated to hidden changeset 471f378eab4c
3432
f57be161f34b test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3431
diff changeset
    73
  (hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    74
  working directory parent is obsolete! (471f378eab4c)
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
    75
  (use 'hg evolve' to update to its successor: d004c8f274b9)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
    76
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
    77
Predecessors template should show current revision as it is the working copy
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
    78
  $ hg olog tip
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
    79
  o  d004c8f274b9 (3) A2
5349
e8660b28bfee obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents: 5330
diff changeset
    80
  |    reworded(description) from a468dc9b3633 using amend by test2 (Thu Apr 19 04:25:21 2001 +0000)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
    81
  |
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
    82
  x  a468dc9b3633 (2) A1
5349
e8660b28bfee obslog: makes --origin flag the default
Anton Shestakov <av6@dwimlabs.net>
parents: 5330
diff changeset
    83
  |    rewritten(description, content) from 471f378eab4c using amend by test (Fri Feb 13 23:31:30 2009 +0000)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
    84
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
    85
  @  471f378eab4c (1) A0
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
    86
  
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
    87
  $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
    88
  o  d004c8f274b9
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
    89
  |    Predecessors: 1:471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
    90
  |    semi-colon: 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
    91
  |    Origin: rewritten using amend from 1:471f378eab4c by test, test2
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
    92
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
    93
  | @  471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
    94
  |/     Successors: 3:d004c8f274b9
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
    95
  |      semi-colon: 3:d004c8f274b9
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
    96
  |      Fate: rewritten using amend as 3:d004c8f274b9 by test, test2
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
    97
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
    98
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
    99
  
3050
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   100
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   101
  $ hg log -G
3057
cb8ae3cb0bbc branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3042 3052
diff changeset
   102
  o  changeset:   3:d004c8f274b9
3050
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   103
  |  tag:         tip
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   104
  |  parent:      0:ea207398892e
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   105
  |  user:        test
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   106
  |  date:        Thu Jan 01 00:00:00 1970 +0000
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   107
  |  summary:     A2
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   108
  |
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   109
  | @  changeset:   1:471f378eab4c
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   110
  |/   user:        test
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   111
  |    date:        Thu Jan 01 00:00:00 1970 +0000
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   112
  |    obsolete:    rewritten using amend as 3:d004c8f274b9 by test, test2
3050
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   113
  |    summary:     A0
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   114
  |
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   115
  o  changeset:   0:ea207398892e
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   116
     user:        test
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   117
     date:        Thu Jan 01 00:00:00 1970 +0000
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   118
     summary:     ROOT
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   119
  
6603d5655192 obsfate: add a test with user both current and other
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3049
diff changeset
   120
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   121
  $ hg fateoriginlog -q
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   122
  o  d004c8f274b9
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   123
  |    Obsorigin: rewritten using amend from 1:471f378eab4c
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   124
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   125
  | @  471f378eab4c
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   126
  |/     Obsfate: rewritten using amend as 3:d004c8f274b9
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   127
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   128
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   129
  
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   130
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   131
  $ hg fateoriginlog
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   132
  o  d004c8f274b9
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   133
  |    Obsorigin: rewritten using amend from 1:471f378eab4c by test, test2
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   134
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   135
  | @  471f378eab4c
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   136
  |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   137
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   138
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   139
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   140
  $ hg fateoriginlog -v
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   141
  o  d004c8f274b9
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   142
  |    Obsorigin: rewritten using amend from 1:471f378eab4c by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   143
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   144
  | @  471f378eab4c
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   145
  |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   146
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   147
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   148
  
2599
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
   149
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
   150
(check json)
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
   151
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   152
  $ hg log -GT '{predecessors|json}\n'
2599
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
   153
  o  ["471f378eab4c5e25f6c77f785b27c936efb22874"]
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
   154
  |
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
   155
  | @  []
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
   156
  |/
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
   157
  o  []
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
   158
  
df4a1b02308f template: used hex-node for the precursors underlying data
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2591
diff changeset
   159
2602
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2599
diff changeset
   160
  $ hg log -GT '{successors|json}\n'
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2599
diff changeset
   161
  o  ""
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2599
diff changeset
   162
  |
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2599
diff changeset
   163
  | @  [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2599
diff changeset
   164
  |/
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2599
diff changeset
   165
  o  ""
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2599
diff changeset
   166
  
31d3be16e65c template: use hex-node in successors
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2599
diff changeset
   167
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   168
  $ hg up 'desc(A1)' --hidden
3747
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   169
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   170
  updated to hidden changeset a468dc9b3633
3432
f57be161f34b test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3431
diff changeset
   171
  (hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   172
  working directory parent is obsolete! (a468dc9b3633)
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   173
  (use 'hg evolve' to update to its successor: d004c8f274b9)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   174
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   175
Predecessors template should show current revision as it is the working copy
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   176
  $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   177
  o  d004c8f274b9
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   178
  |    Predecessors: 2:a468dc9b3633
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   179
  |    semi-colon: 2:a468dc9b3633
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   180
  |    Origin: reworded using amend from 2:a468dc9b3633 by test2
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   181
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   182
  | @  a468dc9b3633
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   183
  |/     Successors: 3:d004c8f274b9
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   184
  |      semi-colon: 3:d004c8f274b9
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   185
  |      Fate: reworded using amend as 3:d004c8f274b9 by test2
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   186
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   187
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   188
  
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   189
Predecessors template should show the precursor as we force its display with
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   190
--hidden  
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   191
  $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   192
  o  d004c8f274b9
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   193
  |    Predecessors: 2:a468dc9b3633
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   194
  |    semi-colon: 2:a468dc9b3633
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   195
  |    Origin: reworded using amend from 2:a468dc9b3633 by test2
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   196
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   197
  | @  a468dc9b3633
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   198
  |/     Predecessors: 1:471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   199
  |      semi-colon: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   200
  |      Successors: 3:d004c8f274b9
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   201
  |      semi-colon: 3:d004c8f274b9
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   202
  |      Fate: reworded using amend as 3:d004c8f274b9 by test2
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   203
  |      Origin: rewritten using amend from 1:471f378eab4c
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   204
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   205
  | x  471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   206
  |/     Successors: 2:a468dc9b3633
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   207
  |      semi-colon: 2:a468dc9b3633
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   208
  |      Fate: rewritten using amend as 2:a468dc9b3633
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   209
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   210
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   211
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   212
  $ hg fateoriginlog -v
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   213
  o  d004c8f274b9
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   214
  |    Obsorigin: reworded using amend from 2:a468dc9b3633 by test2 (at 2001-04-19 04:25 +0000)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   215
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   216
  | @  a468dc9b3633
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   217
  |/     Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   218
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   219
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   220
  
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   221
  $ hg up 'desc(A2)'
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   222
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   223
  $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   224
  @  d004c8f274b9
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   225
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   226
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   227
  
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   228
  $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   229
  @  d004c8f274b9
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   230
  |    Predecessors: 2:a468dc9b3633
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   231
  |    semi-colon: 2:a468dc9b3633
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   232
  |    Origin: reworded using amend from 2:a468dc9b3633 by test2
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   233
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   234
  | x  a468dc9b3633
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   235
  |/     Predecessors: 1:471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   236
  |      semi-colon: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   237
  |      Successors: 3:d004c8f274b9
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   238
  |      semi-colon: 3:d004c8f274b9
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   239
  |      Fate: reworded using amend as 3:d004c8f274b9 by test2
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   240
  |      Origin: rewritten using amend from 1:471f378eab4c
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   241
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   242
  | x  471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   243
  |/     Successors: 2:a468dc9b3633
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   244
  |      semi-colon: 2:a468dc9b3633
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   245
  |      Fate: rewritten using amend as 2:a468dc9b3633
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   246
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   247
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   248
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   249
  $ hg fateoriginlog -v
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   250
  @  d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   251
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   252
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   253
  
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   254
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   255
  $ hg fateoriginlog -v --hidden
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   256
  @  d004c8f274b9
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   257
  |    Obsorigin: reworded using amend from 2:a468dc9b3633 by test2 (at 2001-04-19 04:25 +0000)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   258
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   259
  | x  a468dc9b3633
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   260
  |/     Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   261
  |      Obsorigin: rewritten using amend from 1:471f378eab4c by test (at 2009-02-13 23:31 +0000)
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   262
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   263
  | x  471f378eab4c
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   264
  |/     Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   265
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   266
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   267
  
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   268
4455
b58e45aa9be2 test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4294
diff changeset
   269
Test templates with split commit
b58e45aa9be2 test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4294
diff changeset
   270
================================
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   271
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   272
  $ hg init $TESTTMP/templates-local-split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   273
  $ cd $TESTTMP/templates-local-split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   274
  $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   275
  $ echo 42 >> a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   276
  $ echo 43 >> b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   277
  $ hg commit -A -m "A0"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   278
  adding a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   279
  adding b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   280
  $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   281
  @  changeset:   1:471597cad322
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   282
  |  tag:         tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   283
  |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   284
  |  date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   285
  |  summary:     A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   286
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   287
  o  changeset:   0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   288
     user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   289
     date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   290
     summary:     ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   291
  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   292
  $ hg split -r 'desc(A0)' -d "0 0" << EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   293
  > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   294
  > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   295
  > n
4294
8974a05a49fa split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4293
diff changeset
   296
  > y
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   297
  > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   298
  > y
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   299
  > EOF
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   300
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   301
  adding a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   302
  adding b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   303
  diff --git a/a b/a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   304
  new file mode 100644
4777
ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4712
diff changeset
   305
  examine changes to 'a'? [Ynesfdaq?] y
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   306
  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   307
  @@ -0,0 +1,1 @@
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   308
  +42
4777
ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4712
diff changeset
   309
  record change 1/2 to 'a'? [Ynesfdaq?] y
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   310
  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   311
  diff --git a/b b/b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   312
  new file mode 100644
4777
ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4712
diff changeset
   313
  examine changes to 'b'? [Ynesfdaq?] n
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   314
  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   315
  created new head
4294
8974a05a49fa split: rework the prompt to be more standard
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4293
diff changeset
   316
  continue splitting? [Ycdq?] y
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   317
  diff --git a/b b/b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   318
  new file mode 100644
4777
ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4712
diff changeset
   319
  examine changes to 'b'? [Ynesfdaq?] y
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   320
  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   321
  @@ -0,0 +1,1 @@
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   322
  +43
4777
ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4712
diff changeset
   323
  record this change to 'b'? [Ynesfdaq?] y
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   324
  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   325
  no more change to split
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   326
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   327
  $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   328
  @  changeset:   3:f257fde29c7a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   329
  |  tag:         tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   330
  |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   331
  |  date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   332
  |  summary:     A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   333
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   334
  o  changeset:   2:337fec4d2edc
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   335
  |  parent:      0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   336
  |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   337
  |  date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   338
  |  summary:     A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   339
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   340
  | x  changeset:   1:471597cad322
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   341
  |/   user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   342
  |    date:        Thu Jan 01 00:00:00 1970 +0000
3567
5ddea3b8d2a4 split: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3566
diff changeset
   343
  |    obsolete:    split using split as 2:337fec4d2edc, 3:f257fde29c7a
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   344
  |    summary:     A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   345
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   346
  o  changeset:   0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   347
     user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   348
     date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   349
     summary:     ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   350
  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   351
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   352
Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   353
---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   354
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   355
  $ hg up 'obsolete()' --hidden
3747
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   356
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   357
  updated to hidden changeset 471597cad322
3432
f57be161f34b test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3431
diff changeset
   358
  (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   359
  working directory parent is obsolete! (471597cad322)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   360
  (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   361
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   362
Predecessors template should show current revision as it is the working copy
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   363
  $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   364
  o  f257fde29c7a
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   365
  |    Predecessors: 1:471597cad322
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   366
  |    semi-colon: 1:471597cad322
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   367
  |    Origin: split using split from 1:471597cad322
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   368
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   369
  o  337fec4d2edc
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   370
  |    Predecessors: 1:471597cad322
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   371
  |    semi-colon: 1:471597cad322
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   372
  |    Origin: split using split from 1:471597cad322
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   373
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   374
  | @  471597cad322
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   375
  |/     Successors: 2:337fec4d2edc 3:f257fde29c7a
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   376
  |      semi-colon: 2:337fec4d2edc 3:f257fde29c7a
3567
5ddea3b8d2a4 split: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3566
diff changeset
   377
  |      Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   378
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   379
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   380
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   381
  $ hg fateoriginlog
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   382
  o  f257fde29c7a
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   383
  |    Obsorigin: split using split from 1:471597cad322
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   384
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   385
  o  337fec4d2edc
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   386
  |    Obsorigin: split using split from 1:471597cad322
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   387
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   388
  | @  471597cad322
3567
5ddea3b8d2a4 split: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3566
diff changeset
   389
  |/     Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   390
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   391
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   392
  
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   393
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   394
  $ hg up f257fde29c7a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   395
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   396
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   397
Predecessors template should not show a precursor as it's not displayed in the
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   398
log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   399
  $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   400
  @  f257fde29c7a
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   401
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   402
  o  337fec4d2edc
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   403
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   404
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   405
  
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   406
Predecessors template should show the precursor as we force its display with
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   407
--hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   408
  $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   409
  @  f257fde29c7a
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   410
  |    Predecessors: 1:471597cad322
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   411
  |    semi-colon: 1:471597cad322
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   412
  |    Origin: split using split from 1:471597cad322
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   413
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   414
  o  337fec4d2edc
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   415
  |    Predecessors: 1:471597cad322
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   416
  |    semi-colon: 1:471597cad322
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   417
  |    Origin: split using split from 1:471597cad322
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   418
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   419
  | x  471597cad322
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   420
  |/     Successors: 2:337fec4d2edc 3:f257fde29c7a
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   421
  |      semi-colon: 2:337fec4d2edc 3:f257fde29c7a
3567
5ddea3b8d2a4 split: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3566
diff changeset
   422
  |      Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   423
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   424
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   425
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   426
  $ hg fateoriginlog --hidden
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   427
  @  f257fde29c7a
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   428
  |    Obsorigin: split using split from 1:471597cad322
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   429
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   430
  o  337fec4d2edc
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   431
  |    Obsorigin: split using split from 1:471597cad322
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   432
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   433
  | x  471597cad322
3567
5ddea3b8d2a4 split: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3566
diff changeset
   434
  |/     Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   435
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   436
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   437
  
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   438
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   439
Test templates with folded commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   440
==============================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   441
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   442
Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   443
----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   444
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   445
  $ hg init $TESTTMP/templates-local-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   446
  $ cd $TESTTMP/templates-local-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   447
  $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   448
  $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   449
  $ mkcommit B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   450
  $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   451
  @  changeset:   2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   452
  |  tag:         tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   453
  |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   454
  |  date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   455
  |  summary:     B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   456
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   457
  o  changeset:   1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   458
  |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   459
  |  date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   460
  |  summary:     A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   461
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   462
  o  changeset:   0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   463
     user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   464
     date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   465
     summary:     ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   466
  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   467
  $ hg fold --exact -r 'desc(A0) + desc(B0)' --date "0 0" -m "C0"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   468
  2 changesets folded
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   469
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   470
  $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   471
  @  changeset:   3:eb5a0daa2192
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   472
  |  tag:         tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   473
  |  parent:      0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   474
  |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   475
  |  date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   476
  |  summary:     C0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   477
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   478
  | x  changeset:   2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   479
  | |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   480
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   481
  | |  obsolete:    rewritten using fold as 3:eb5a0daa2192
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   482
  | |  summary:     B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   483
  | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   484
  | x  changeset:   1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   485
  |/   user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   486
  |    date:        Thu Jan 01 00:00:00 1970 +0000
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   487
  |    obsolete:    rewritten using fold as 3:eb5a0daa2192
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   488
  |    summary:     A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   489
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   490
  o  changeset:   0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   491
     user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   492
     date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   493
     summary:     ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   494
  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   495
Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   496
---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   497
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   498
  $ hg up 'desc(A0)' --hidden
3747
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   499
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   500
  updated to hidden changeset 471f378eab4c
3432
f57be161f34b test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3431
diff changeset
   501
  (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   502
  working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   503
  (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   504
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   505
Predecessors template should show current revision as it is the working copy
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   506
  $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   507
  o  eb5a0daa2192
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   508
  |    Predecessors: 1:471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   509
  |    semi-colon: 1:471f378eab4c
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   510
  |    Origin: rewritten using fold from 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   511
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   512
  | @  471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   513
  |/     Successors: 3:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   514
  |      semi-colon: 3:eb5a0daa2192
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   515
  |      Fate: rewritten using fold as 3:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   516
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   517
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   518
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   519
  $ hg fateoriginlog
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   520
  o  eb5a0daa2192
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   521
  |    Obsorigin: rewritten using fold from 1:471f378eab4c
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   522
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   523
  | @  471f378eab4c
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   524
  |/     Obsfate: rewritten using fold as 3:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   525
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   526
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   527
  
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   528
  $ hg up 'desc(B0)' --hidden
3747
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   529
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   530
  updated to hidden changeset 0dec01379d3b
3432
f57be161f34b test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3431
diff changeset
   531
  (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   532
  working directory parent is obsolete! (0dec01379d3b)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   533
  (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   534
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   535
Predecessors template should show both predecessors as they should be both
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   536
displayed
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   537
  $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   538
  o  eb5a0daa2192
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   539
  |    Predecessors: 2:0dec01379d3b 1:471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   540
  |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   541
  |    Origin: rewritten using fold from 2:0dec01379d3b
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   542
  |    Origin: rewritten using fold from 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   543
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   544
  | @  0dec01379d3b
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   545
  | |    Successors: 3:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   546
  | |    semi-colon: 3:eb5a0daa2192
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   547
  | |    Fate: rewritten using fold as 3:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   548
  | |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   549
  | x  471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   550
  |/     Successors: 3:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   551
  |      semi-colon: 3:eb5a0daa2192
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   552
  |      Fate: rewritten using fold as 3:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   553
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   554
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   555
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   556
  $ hg fateoriginlog
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   557
  o  eb5a0daa2192
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   558
  |    Obsorigin: rewritten using fold from 2:0dec01379d3b; rewritten using fold from 1:471f378eab4c
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   559
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   560
  | @  0dec01379d3b
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   561
  | |    Obsfate: rewritten using fold as 3:eb5a0daa2192
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   562
  | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   563
  | x  471f378eab4c
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   564
  |/     Obsfate: rewritten using fold as 3:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   565
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   566
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   567
  
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   568
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   569
  $ hg up 'desc(C0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   570
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   571
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   572
Predecessors template should not show predecessors as it's not displayed in the
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   573
log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   574
  $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   575
  @  eb5a0daa2192
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   576
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   577
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   578
  
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   579
Predecessors template should show both predecessors as we force its display with
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   580
--hidden
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   581
  $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   582
  @  eb5a0daa2192
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   583
  |    Predecessors: 2:0dec01379d3b 1:471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   584
  |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   585
  |    Origin: rewritten using fold from 2:0dec01379d3b
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   586
  |    Origin: rewritten using fold from 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   587
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   588
  | x  0dec01379d3b
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   589
  | |    Successors: 3:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   590
  | |    semi-colon: 3:eb5a0daa2192
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   591
  | |    Fate: rewritten using fold as 3:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   592
  | |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   593
  | x  471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   594
  |/     Successors: 3:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   595
  |      semi-colon: 3:eb5a0daa2192
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   596
  |      Fate: rewritten using fold as 3:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   597
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   598
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   599
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   600
  $ hg fateoriginlog --hidden
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   601
  @  eb5a0daa2192
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   602
  |    Obsorigin: rewritten using fold from 2:0dec01379d3b; rewritten using fold from 1:471f378eab4c
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   603
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   604
  | x  0dec01379d3b
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   605
  | |    Obsfate: rewritten using fold as 3:eb5a0daa2192
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   606
  | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   607
  | x  471f378eab4c
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   608
  |/     Obsfate: rewritten using fold as 3:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   609
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   610
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   611
  
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   612
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   613
Test templates with divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   614
==============================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   615
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   616
Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   617
----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   618
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   619
  $ hg init $TESTTMP/templates-local-divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   620
  $ cd $TESTTMP/templates-local-divergence
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   621
  $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   622
  $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   623
  $ hg amend -m "A1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   624
  $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   625
  @  changeset:   2:fdf9bde5129a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   626
  |  tag:         tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   627
  |  parent:      0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   628
  |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   629
  |  date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   630
  |  summary:     A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   631
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   632
  | x  changeset:   1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   633
  |/   user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   634
  |    date:        Thu Jan 01 00:00:00 1970 +0000
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   635
  |    obsolete:    reworded using amend as 2:fdf9bde5129a
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   636
  |    summary:     A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   637
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   638
  o  changeset:   0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   639
     user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   640
     date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   641
     summary:     ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   642
  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   643
  $ hg update --hidden 'desc(A0)'
3747
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   644
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   645
  updated to hidden changeset 471f378eab4c
3432
f57be161f34b test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3431
diff changeset
   646
  (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   647
  working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   648
  (use 'hg evolve' to update to its successor: fdf9bde5129a)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   649
  $ hg amend -m "A2"
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   650
  2 new content-divergent changesets
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   651
  $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   652
  @  changeset:   3:65b757b745b9
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   653
  |  tag:         tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   654
  |  parent:      0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   655
  |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   656
  |  date:        Thu Jan 01 00:00:00 1970 +0000
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   657
  |  instability: content-divergent
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   658
  |  summary:     A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   659
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
   660
  | *  changeset:   2:fdf9bde5129a
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   661
  |/   parent:      0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   662
  |    user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   663
  |    date:        Thu Jan 01 00:00:00 1970 +0000
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   664
  |    instability: content-divergent
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   665
  |    summary:     A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   666
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   667
  | x  changeset:   1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   668
  |/   user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   669
  |    date:        Thu Jan 01 00:00:00 1970 +0000
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   670
  |    obsolete:    reworded using amend as 2:fdf9bde5129a
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   671
  |    obsolete:    reworded using amend as 3:65b757b745b9
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   672
  |    summary:     A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   673
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   674
  o  changeset:   0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   675
     user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   676
     date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   677
     summary:     ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   678
  
2487
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   679
  $ hg amend -m 'A3'
590da9c523ae template: add successors template
Boris Feld <boris.feld@octobus.net>
parents: 2486
diff changeset
   680
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   681
Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   682
---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   683
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   684
  $ hg up 'desc(A0)' --hidden
3747
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   685
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   686
  updated to hidden changeset 471f378eab4c
3432
f57be161f34b test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3431
diff changeset
   687
  (hidden revision '471f378eab4c' has diverged)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   688
  working directory parent is obsolete! (471f378eab4c)
3154
406992d0d611 evolve: rename --contentdivergent flag to --content-divergent
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3115
diff changeset
   689
  (471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   690
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   691
Predecessors template should show current revision as it is the working copy
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   692
  $ hg tlog
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
   693
  *  019fadeab383
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   694
  |    Predecessors: 1:471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   695
  |    semi-colon: 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   696
  |    Origin: reworded using amend from 1:471f378eab4c
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   697
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
   698
  | *  fdf9bde5129a
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   699
  |/     Predecessors: 1:471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   700
  |      semi-colon: 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   701
  |      Origin: reworded using amend from 1:471f378eab4c
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   702
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   703
  | @  471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   704
  |/     Successors: 2:fdf9bde5129a; 4:019fadeab383
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   705
  |      semi-colon: 2:fdf9bde5129a; 4:019fadeab383
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   706
  |      Fate: reworded using amend as 2:fdf9bde5129a
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   707
  |      Fate: reworded using amend as 4:019fadeab383
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   708
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   709
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   710
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   711
  $ hg fateoriginlog
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
   712
  *  019fadeab383
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   713
  |    Obsorigin: reworded using amend from 1:471f378eab4c
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   714
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
   715
  | *  fdf9bde5129a
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   716
  |/     Obsorigin: reworded using amend from 1:471f378eab4c
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   717
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   718
  | @  471f378eab4c
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   719
  |/     Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   720
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   721
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   722
  
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   723
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   724
  $ hg up 'desc(A1)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   725
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   726
Predecessors template should not show predecessors as it's not displayed in the
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   727
log
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   728
  $ hg tlog
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
   729
  *  019fadeab383
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   730
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   731
  | @  fdf9bde5129a
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   732
  |/
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   733
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   734
  
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   735
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   736
  $ hg fateoriginlog
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
   737
  *  019fadeab383
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   738
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   739
  | @  fdf9bde5129a
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   740
  |/
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   741
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   742
  
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   743
Predecessors template should a precursor as we force its display with --hidden
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   744
  $ hg tlog --hidden
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
   745
  *  019fadeab383
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   746
  |    Predecessors: 3:65b757b745b9
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   747
  |    semi-colon: 3:65b757b745b9
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   748
  |    Origin: reworded using amend from 3:65b757b745b9
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   749
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   750
  | x  65b757b745b9
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   751
  |/     Predecessors: 1:471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   752
  |      semi-colon: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   753
  |      Successors: 4:019fadeab383
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   754
  |      semi-colon: 4:019fadeab383
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   755
  |      Fate: reworded using amend as 4:019fadeab383
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   756
  |      Origin: reworded using amend from 1:471f378eab4c
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   757
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   758
  | @  fdf9bde5129a
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   759
  |/     Predecessors: 1:471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   760
  |      semi-colon: 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   761
  |      Origin: reworded using amend from 1:471f378eab4c
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   762
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   763
  | x  471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   764
  |/     Successors: 2:fdf9bde5129a; 3:65b757b745b9
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   765
  |      semi-colon: 2:fdf9bde5129a; 3:65b757b745b9
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   766
  |      Fate: reworded using amend as 2:fdf9bde5129a
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   767
  |      Fate: reworded using amend as 3:65b757b745b9
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   768
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   769
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   770
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   771
  $ hg fateoriginlog --hidden
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
   772
  *  019fadeab383
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   773
  |    Obsorigin: reworded using amend from 3:65b757b745b9
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   774
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   775
  | x  65b757b745b9
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   776
  |/     Obsfate: reworded using amend as 4:019fadeab383
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   777
  |      Obsorigin: reworded using amend from 1:471f378eab4c
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   778
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   779
  | @  fdf9bde5129a
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   780
  |/     Obsorigin: reworded using amend from 1:471f378eab4c
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   781
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   782
  | x  471f378eab4c
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   783
  |/     Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 3:65b757b745b9
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   784
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   785
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   786
  
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   787
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   788
Test templates with amended + folded commit
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   789
===========================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   790
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   791
Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   792
----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   793
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   794
  $ hg init $TESTTMP/templates-local-amend-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   795
  $ cd $TESTTMP/templates-local-amend-fold
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   796
  $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   797
  $ mkcommit A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   798
  $ mkcommit B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   799
  $ hg amend -m "B1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   800
  $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   801
  @  changeset:   3:b7ea6d14e664
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   802
  |  tag:         tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   803
  |  parent:      1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   804
  |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   805
  |  date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   806
  |  summary:     B1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   807
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   808
  | x  changeset:   2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   809
  |/   user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   810
  |    date:        Thu Jan 01 00:00:00 1970 +0000
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   811
  |    obsolete:    reworded using amend as 3:b7ea6d14e664
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   812
  |    summary:     B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   813
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   814
  o  changeset:   1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   815
  |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   816
  |  date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   817
  |  summary:     A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   818
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   819
  o  changeset:   0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   820
     user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   821
     date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   822
     summary:     ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   823
  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   824
  $ hg fold --exact -r 'desc(A0) + desc(B1)' --date "0 0" -m "C0"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   825
  2 changesets folded
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   826
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   827
  $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   828
  @  changeset:   4:eb5a0daa2192
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   829
  |  tag:         tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   830
  |  parent:      0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   831
  |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   832
  |  date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   833
  |  summary:     C0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   834
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   835
  | x  changeset:   3:b7ea6d14e664
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   836
  | |  parent:      1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   837
  | |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   838
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   839
  | |  obsolete:    rewritten using fold as 4:eb5a0daa2192
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   840
  | |  summary:     B1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   841
  | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   842
  | | x  changeset:   2:0dec01379d3b
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   843
  | |/   user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   844
  | |    date:        Thu Jan 01 00:00:00 1970 +0000
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   845
  | |    obsolete:    reworded using amend as 3:b7ea6d14e664
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   846
  | |    summary:     B0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   847
  | |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   848
  | x  changeset:   1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   849
  |/   user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   850
  |    date:        Thu Jan 01 00:00:00 1970 +0000
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   851
  |    obsolete:    rewritten using fold as 4:eb5a0daa2192
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   852
  |    summary:     A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   853
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   854
  o  changeset:   0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   855
     user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   856
     date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   857
     summary:     ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   858
  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   859
Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   860
---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   861
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   862
  $ hg up 'desc(A0)' --hidden
3747
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   863
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   864
  updated to hidden changeset 471f378eab4c
3432
f57be161f34b test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3431
diff changeset
   865
  (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   866
  working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   867
  (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   868
  $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   869
  o  eb5a0daa2192
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   870
  |    Predecessors: 1:471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   871
  |    semi-colon: 1:471f378eab4c
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   872
  |    Origin: rewritten using fold from 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   873
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   874
  | @  471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   875
  |/     Successors: 4:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   876
  |      semi-colon: 4:eb5a0daa2192
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   877
  |      Fate: rewritten using fold as 4:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   878
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   879
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   880
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   881
  $ hg fateoriginlog
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   882
  o  eb5a0daa2192
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   883
  |    Obsorigin: rewritten using fold from 1:471f378eab4c
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   884
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   885
  | @  471f378eab4c
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   886
  |/     Obsfate: rewritten using fold as 4:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   887
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   888
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   889
  
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   890
  $ hg up 'desc(B0)' --hidden
3747
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   891
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   892
  updated to hidden changeset 0dec01379d3b
3432
f57be161f34b test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3431
diff changeset
   893
  (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   894
  working directory parent is obsolete! (0dec01379d3b)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   895
  (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   896
  $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   897
  o  eb5a0daa2192
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   898
  |    Predecessors: 2:0dec01379d3b 1:471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   899
  |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   900
  |    Origin: rewritten using amend, fold from 2:0dec01379d3b
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   901
  |    Origin: rewritten using fold from 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   902
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   903
  | @  0dec01379d3b
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   904
  | |    Successors: 4:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   905
  | |    semi-colon: 4:eb5a0daa2192
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   906
  | |    Fate: rewritten using amend, fold as 4:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   907
  | |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   908
  | x  471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   909
  |/     Successors: 4:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   910
  |      semi-colon: 4:eb5a0daa2192
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   911
  |      Fate: rewritten using fold as 4:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   912
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   913
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   914
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   915
  $ hg fateoriginlog
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   916
  o  eb5a0daa2192
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   917
  |    Obsorigin: rewritten using amend, fold from 2:0dec01379d3b; rewritten using fold from 1:471f378eab4c
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   918
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   919
  | @  0dec01379d3b
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   920
  | |    Obsfate: rewritten using amend, fold as 4:eb5a0daa2192
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   921
  | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   922
  | x  471f378eab4c
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   923
  |/     Obsfate: rewritten using fold as 4:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   924
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   925
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   926
  
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   927
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   928
  $ hg up 'desc(B1)' --hidden
3747
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   929
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
   930
  updated to hidden changeset b7ea6d14e664
3432
f57be161f34b test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3431
diff changeset
   931
  (hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   932
  working directory parent is obsolete! (b7ea6d14e664)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   933
  (use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   934
  $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   935
  o  eb5a0daa2192
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   936
  |    Predecessors: 1:471f378eab4c 3:b7ea6d14e664
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   937
  |    semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   938
  |    Origin: rewritten using fold from 1:471f378eab4c
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   939
  |    Origin: rewritten using fold from 3:b7ea6d14e664
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   940
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   941
  | @  b7ea6d14e664
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   942
  | |    Successors: 4:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   943
  | |    semi-colon: 4:eb5a0daa2192
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   944
  | |    Fate: rewritten using fold as 4:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   945
  | |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   946
  | x  471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   947
  |/     Successors: 4:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   948
  |      semi-colon: 4:eb5a0daa2192
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   949
  |      Fate: rewritten using fold as 4:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   950
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   951
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   952
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   953
  $ hg fateoriginlog
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   954
  o  eb5a0daa2192
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   955
  |    Obsorigin: rewritten using fold from 1:471f378eab4c; rewritten using fold from 3:b7ea6d14e664
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   956
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   957
  | @  b7ea6d14e664
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   958
  | |    Obsfate: rewritten using fold as 4:eb5a0daa2192
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   959
  | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   960
  | x  471f378eab4c
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   961
  |/     Obsfate: rewritten using fold as 4:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   962
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   963
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   964
  
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
   965
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   966
  $ hg up 'desc(C0)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   967
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   968
  $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   969
  @  eb5a0daa2192
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   970
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   971
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   972
  
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   973
  $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   974
  @  eb5a0daa2192
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   975
  |    Predecessors: 1:471f378eab4c 3:b7ea6d14e664
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   976
  |    semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   977
  |    Origin: rewritten using fold from 1:471f378eab4c
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
   978
  |    Origin: rewritten using fold from 3:b7ea6d14e664
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   979
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   980
  | x  b7ea6d14e664
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
   981
  | |    Predecessors: 2:0dec01379d3b
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   982
  | |    semi-colon: 2:0dec01379d3b
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   983
  | |    Successors: 4:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   984
  | |    semi-colon: 4:eb5a0daa2192
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   985
  | |    Fate: rewritten using fold as 4:eb5a0daa2192
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
   986
  | |    Origin: reworded using amend from 2:0dec01379d3b
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   987
  | |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   988
  | | x  0dec01379d3b
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   989
  | |/     Successors: 3:b7ea6d14e664
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   990
  | |      semi-colon: 3:b7ea6d14e664
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
   991
  | |      Fate: reworded using amend as 3:b7ea6d14e664
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   992
  | |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   993
  | x  471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   994
  |/     Successors: 4:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
   995
  |      semi-colon: 4:eb5a0daa2192
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
   996
  |      Fate: rewritten using fold as 4:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
   997
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
   998
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
   999
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1000
  $ hg fateoriginlog --hidden
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1001
  @  eb5a0daa2192
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
  1002
  |    Obsorigin: rewritten using fold from 1:471f378eab4c; rewritten using fold from 3:b7ea6d14e664
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1003
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1004
  | x  b7ea6d14e664
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
  1005
  | |    Obsfate: rewritten using fold as 4:eb5a0daa2192
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1006
  | |    Obsorigin: reworded using amend from 2:0dec01379d3b
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1007
  | |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1008
  | | x  0dec01379d3b
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
  1009
  | |/     Obsfate: reworded using amend as 3:b7ea6d14e664
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
  1010
  | |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1011
  | x  471f378eab4c
3564
589649021ea1 fold: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3520
diff changeset
  1012
  |/     Obsfate: rewritten using fold as 4:eb5a0daa2192
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
  1013
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1014
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1015
  
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1016
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1017
Test template with pushed and pulled obs markers
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1018
==============================================
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1019
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1020
Test setup
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1021
----------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1022
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1023
  $ hg init $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1024
  $ cd $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1025
  $ mkcommit ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1026
  $ mkcommit A0  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1027
  $ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1028
  updating to branch default
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1029
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1030
  $ cd $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1031
  $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1032
  @  changeset:   1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1033
  |  tag:         tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1034
  |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1035
  |  date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1036
  |  summary:     A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1037
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1038
  o  changeset:   0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1039
     user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1040
     date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1041
     summary:     ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1042
  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1043
  $ cd $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1044
  $ hg amend -m "A1"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1045
  $ hg amend -m "A2"
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1046
  $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1047
  @  changeset:   3:7a230b46bf61
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1048
  |  tag:         tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1049
  |  parent:      0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1050
  |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1051
  |  date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1052
  |  summary:     A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1053
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1054
  | x  changeset:   2:fdf9bde5129a
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1055
  |/   parent:      0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1056
  |    user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1057
  |    date:        Thu Jan 01 00:00:00 1970 +0000
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
  1058
  |    obsolete:    reworded using amend as 3:7a230b46bf61
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1059
  |    summary:     A1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1060
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1061
  | x  changeset:   1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1062
  |/   user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1063
  |    date:        Thu Jan 01 00:00:00 1970 +0000
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
  1064
  |    obsolete:    reworded using amend as 2:fdf9bde5129a
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1065
  |    summary:     A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1066
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1067
  o  changeset:   0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1068
     user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1069
     date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1070
     summary:     ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1071
  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1072
  $ cd $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1073
  $ hg pull
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1074
  pulling from $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1075
  searching for changes
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1076
  adding changesets
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1077
  adding manifests
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1078
  adding file changes
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1079
  added 1 changesets with 0 changes to 1 files (+1 heads)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1080
  2 new obsolescence markers
2710
e22de367fc74 compat: adapt to change in 53b3a1968aa6-core
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2709
diff changeset
  1081
  obsoleted 1 changesets
4202
f555039d1a08 branching: revert test outptu change for 4.7
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4181
diff changeset
  1082
  new changesets 7a230b46bf61
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1083
  (run 'hg heads' to see heads, 'hg merge' to merge)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1084
  working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1085
  (use 'hg evolve' to update to its successor: 7a230b46bf61)
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1086
  $ hg log --hidden -G
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1087
  o  changeset:   2:7a230b46bf61
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1088
  |  tag:         tip
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1089
  |  parent:      0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1090
  |  user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1091
  |  date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1092
  |  summary:     A2
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1093
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1094
  | @  changeset:   1:471f378eab4c
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1095
  |/   user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1096
  |    date:        Thu Jan 01 00:00:00 1970 +0000
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
  1097
  |    obsolete:    reworded using amend as 2:7a230b46bf61
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1098
  |    summary:     A0
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1099
  |
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1100
  o  changeset:   0:ea207398892e
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1101
     user:        test
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1102
     date:        Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1103
     summary:     ROOT
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1104
  
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1105
Check templates
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1106
---------------
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1107
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1108
  $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
  1109
  o  7a230b46bf61
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1110
  |    Predecessors: 1:471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
  1111
  |    semi-colon: 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1112
  |    Origin: reworded using amend from 1:471f378eab4c
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1113
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
  1114
  | @  471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
  1115
  |/     Successors: 2:7a230b46bf61
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
  1116
  |      semi-colon: 2:7a230b46bf61
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
  1117
  |      Fate: reworded using amend as 2:7a230b46bf61
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
  1118
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
  1119
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
  1120
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1121
  $ hg fateoriginlog --hidden -v
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1122
  o  7a230b46bf61
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1123
  |    Obsorigin: reworded using amend from 1:471f378eab4c by test (at 1970-01-01 00:00 +0000)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1124
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1125
  | @  471f378eab4c
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
  1126
  |/     Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
  1127
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1128
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1129
  
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1130
  $ hg up 'desc(A2)'
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1131
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1132
  $ hg tlog
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
  1133
  @  7a230b46bf61
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
  1134
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
  1135
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
  1136
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1137
  $ hg fateoriginlog -v
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1138
  @  7a230b46bf61
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1139
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1140
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1141
  
2486
cd4290f923b7 template: add precursors template
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
  1142
  $ hg tlog --hidden
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
  1143
  @  7a230b46bf61
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1144
  |    Predecessors: 1:471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
  1145
  |    semi-colon: 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1146
  |    Origin: reworded using amend from 1:471f378eab4c
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1147
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
  1148
  | x  471f378eab4c
3083
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
  1149
  |/     Successors: 2:7a230b46bf61
e91ca8b5ecf7 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3057
diff changeset
  1150
  |      semi-colon: 2:7a230b46bf61
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
  1151
  |      Fate: reworded using amend as 2:7a230b46bf61
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
  1152
  |
2495
0db53f48db2d template: move each template on its own line during tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2494
diff changeset
  1153
  o  ea207398892e
2499
8abc7066e384 template: skip "fate" in test output when empty
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2498
diff changeset
  1154
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1155
  $ hg fateoriginlog --hidden -v
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1156
  @  7a230b46bf61
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1157
  |    Obsorigin: reworded using amend from 1:471f378eab4c by test (at 1970-01-01 00:00 +0000)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1158
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1159
  | x  471f378eab4c
3115
663dbef40f97 obsfate: re-enables operation display in obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3083
diff changeset
  1160
  |/     Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
  1161
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1162
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1163
  
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1164
 
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1165
Test template with obsmarkers cycle
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1166
===================================
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1167
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1168
Test setup
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1169
----------
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1170
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1171
  $ hg init $TESTTMP/templates-local-cycle
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1172
  $ cd $TESTTMP/templates-local-cycle
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1173
  $ mkcommit ROOT
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1174
  $ mkcommit A0
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1175
  $ mkcommit B0
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1176
  $ hg up -r 0
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1177
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1178
  $ mkcommit C0
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1179
  created new head
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1180
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1181
Create the cycle
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1182
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1183
  $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1184
  obsoleted 1 changesets
3431
2e703ed1c713 evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents: 3417
diff changeset
  1185
  1 new orphan changesets
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1186
  $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1187
  obsoleted 1 changesets
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1188
  $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1189
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1190
Check templates
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1191
---------------
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1192
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1193
  $ hg tlog
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1194
  @  f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1195
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1196
  o  ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1197
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1198
  $ hg fateoriginlog
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1199
  @  f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1200
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1201
  o  ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1202
  
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1203
  $ hg up -r "desc(B0)" --hidden
3747
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
  1204
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
  1205
  updated to hidden changeset 0dec01379d3b
3432
f57be161f34b test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3431
diff changeset
  1206
  (hidden revision '0dec01379d3b' is pruned)
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1207
  working directory parent is obsolete! (0dec01379d3b)
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1208
  (use 'hg evolve' to update to its parent successor)
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1209
  $ hg tlog
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1210
  o  f897c6137566
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1211
  |    Predecessors: 2:0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1212
  |    semi-colon: 2:0dec01379d3b
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1213
  |    Origin: rewritten from 2:0dec01379d3b
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1214
  |
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1215
  | @  0dec01379d3b
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1216
  | |    Predecessors: 1:471f378eab4c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1217
  | |    semi-colon: 1:471f378eab4c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1218
  | |    Successors: 3:f897c6137566; 1:471f378eab4c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1219
  | |    semi-colon: 3:f897c6137566; 1:471f378eab4c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1220
  | |    Fate: rewritten as 3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1221
  | |    Fate: rewritten as 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1222
  | |    Origin: rewritten from 1:471f378eab4c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1223
  | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1224
  | x  471f378eab4c
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1225
  |/     Predecessors: 2:0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1226
  |      semi-colon: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1227
  |      Successors: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1228
  |      semi-colon: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1229
  |      Fate: rewritten as 2:0dec01379d3b
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1230
  |      Origin: rewritten from 2:0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1231
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1232
  o  ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1233
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1234
  $ hg fateoriginlog
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1235
  o  f897c6137566
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1236
  |    Obsorigin: rewritten from 2:0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1237
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1238
  | @  0dec01379d3b
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1239
  | |    Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1240
  | |    Obsorigin: rewritten from 1:471f378eab4c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1241
  | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1242
  | x  471f378eab4c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1243
  |/     Obsfate: rewritten as 2:0dec01379d3b
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1244
  |      Obsorigin: rewritten from 2:0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1245
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1246
  o  ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1247
  
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1248
  $ hg up -r "desc(A0)" --hidden
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1249
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1250
  working directory parent is obsolete! (471f378eab4c)
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1251
  (use 'hg evolve' to update to its parent successor)
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1252
  $ hg tlog
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1253
  o  f897c6137566
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1254
  |    Predecessors: 1:471f378eab4c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1255
  |    semi-colon: 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1256
  |    Origin: rewritten from 1:471f378eab4c
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1257
  |
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1258
  | @  471f378eab4c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1259
  |/     Fate: pruned
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1260
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1261
  o  ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1262
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1263
  $ hg fateoriginlog
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1264
  o  f897c6137566
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1265
  |    Obsorigin: rewritten from 1:471f378eab4c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1266
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1267
  | @  471f378eab4c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1268
  |/     Obsfate: pruned
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1269
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1270
  o  ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1271
  
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1272
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1273
  $ hg up -r "desc(ROOT)" --hidden
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1274
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1275
  $ hg tlog
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1276
  o  f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1277
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1278
  @  ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1279
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1280
  $ hg fateoriginlog
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1281
  o  f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1282
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1283
  @  ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1284
  
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1285
  $ hg tlog --hidden
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1286
  o  f897c6137566
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1287
  |    Predecessors: 2:0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1288
  |    semi-colon: 2:0dec01379d3b
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1289
  |    Origin: rewritten from 2:0dec01379d3b
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1290
  |
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1291
  | x  0dec01379d3b
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1292
  | |    Predecessors: 1:471f378eab4c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1293
  | |    semi-colon: 1:471f378eab4c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1294
  | |    Successors: 3:f897c6137566; 1:471f378eab4c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1295
  | |    semi-colon: 3:f897c6137566; 1:471f378eab4c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1296
  | |    Fate: rewritten as 3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1297
  | |    Fate: rewritten as 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1298
  | |    Origin: rewritten from 1:471f378eab4c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1299
  | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1300
  | x  471f378eab4c
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1301
  |/     Predecessors: 2:0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1302
  |      semi-colon: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1303
  |      Successors: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1304
  |      semi-colon: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1305
  |      Fate: rewritten as 2:0dec01379d3b
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1306
  |      Origin: rewritten from 2:0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1307
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1308
  @  ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1309
  
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1310
Test template with split + divergence with cycles
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1311
=================================================
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1312
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1313
  $ hg log -G
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1314
  o  changeset:   3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1315
  |  tag:         tip
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1316
  |  parent:      0:ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1317
  |  user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1318
  |  date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1319
  |  summary:     C0
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1320
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1321
  @  changeset:   0:ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1322
     user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1323
     date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1324
     summary:     ROOT
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1325
  
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1326
  $ hg up
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1327
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1328
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1329
Create a commit with three files
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1330
  $ touch A B C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1331
  $ hg commit -A -m "Add A,B,C" A B C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1332
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1333
Split it
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1334
  $ hg up 3
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1335
  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1336
  $ touch A
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1337
  $ hg commit -A -m "Add A,B,C" A
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1338
  created new head
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1339
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1340
  $ touch B
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1341
  $ hg commit -A -m "Add A,B,C" B
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1342
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1343
  $ touch C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1344
  $ hg commit -A -m "Add A,B,C" C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1345
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1346
  $ hg log -G
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1347
  @  changeset:   7:ba2ed02b0c9a
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1348
  |  tag:         tip
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1349
  |  user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1350
  |  date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1351
  |  summary:     Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1352
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1353
  o  changeset:   6:4a004186e638
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1354
  |  user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1355
  |  date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1356
  |  summary:     Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1357
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1358
  o  changeset:   5:dd800401bd8c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1359
  |  parent:      3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1360
  |  user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1361
  |  date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1362
  |  summary:     Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1363
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1364
  | o  changeset:   4:9bd10a0775e4
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1365
  |/   user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1366
  |    date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1367
  |    summary:     Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1368
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1369
  o  changeset:   3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1370
  |  parent:      0:ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1371
  |  user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1372
  |  date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1373
  |  summary:     C0
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1374
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1375
  o  changeset:   0:ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1376
     user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1377
     date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1378
     summary:     ROOT
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1379
  
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1380
  $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"`
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1381
  obsoleted 1 changesets
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1382
  $ hg log -G
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1383
  @  changeset:   7:ba2ed02b0c9a
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1384
  |  tag:         tip
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1385
  |  user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1386
  |  date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1387
  |  summary:     Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1388
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1389
  o  changeset:   6:4a004186e638
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1390
  |  user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1391
  |  date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1392
  |  summary:     Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1393
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1394
  o  changeset:   5:dd800401bd8c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1395
  |  parent:      3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1396
  |  user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1397
  |  date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1398
  |  summary:     Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1399
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1400
  o  changeset:   3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1401
  |  parent:      0:ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1402
  |  user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1403
  |  date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1404
  |  summary:     C0
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1405
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1406
  o  changeset:   0:ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1407
     user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1408
     date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1409
     summary:     ROOT
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1410
  
4455
b58e45aa9be2 test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4294
diff changeset
  1411
Diverge one of the split commit
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1412
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1413
  $ hg up 6
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1414
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1415
  $ hg commit --amend -m "Add only B"
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1416
  1 new orphan changesets
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1417
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1418
  $ hg up 6 --hidden
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1419
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1420
  working directory parent is obsolete! (4a004186e638)
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1421
  (use 'hg evolve' to update to its successor: b18bc8331526)
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1422
  $ hg commit --amend -m "Add B only"
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1423
  4 new content-divergent changesets
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1424
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1425
  $ hg log -G
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1426
  @  changeset:   9:0b997eb7ceee
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1427
  |  tag:         tip
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1428
  |  parent:      5:dd800401bd8c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1429
  |  user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1430
  |  date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1431
  |  instability: content-divergent
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1432
  |  summary:     Add B only
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1433
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1434
  | *  changeset:   8:b18bc8331526
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1435
  |/   parent:      5:dd800401bd8c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1436
  |    user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1437
  |    date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1438
  |    instability: content-divergent
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1439
  |    summary:     Add only B
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1440
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1441
  | *  changeset:   7:ba2ed02b0c9a
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1442
  | |  user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1443
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1444
  | |  instability: orphan, content-divergent
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1445
  | |  summary:     Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1446
  | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1447
  | x  changeset:   6:4a004186e638
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1448
  |/   user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1449
  |    date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1450
  |    obsolete:    reworded using amend as 8:b18bc8331526
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1451
  |    obsolete:    reworded using amend as 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1452
  |    summary:     Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1453
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1454
  *  changeset:   5:dd800401bd8c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1455
  |  parent:      3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1456
  |  user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1457
  |  date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1458
  |  instability: content-divergent
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1459
  |  summary:     Add A,B,C
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1460
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1461
  o  changeset:   3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1462
  |  parent:      0:ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1463
  |  user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1464
  |  date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1465
  |  summary:     C0
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1466
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1467
  o  changeset:   0:ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1468
     user:        test
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1469
     date:        Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1470
     summary:     ROOT
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1471
  
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1472
Check templates
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1473
---------------
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1474
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1475
  $ hg tlog
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1476
  @  0b997eb7ceee
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1477
  |    Predecessors: 6:4a004186e638
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1478
  |    semi-colon: 6:4a004186e638
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1479
  |    Origin: reworded using amend from 6:4a004186e638
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1480
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1481
  | *  b18bc8331526
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1482
  |/     Predecessors: 6:4a004186e638
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1483
  |      semi-colon: 6:4a004186e638
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1484
  |      Origin: reworded using amend from 6:4a004186e638
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1485
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1486
  | *  ba2ed02b0c9a
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1487
  | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1488
  | x  4a004186e638
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1489
  |/     Successors: 8:b18bc8331526; 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1490
  |      semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1491
  |      Fate: reworded using amend as 8:b18bc8331526
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1492
  |      Fate: reworded using amend as 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1493
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1494
  *  dd800401bd8c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1495
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1496
  o  f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1497
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1498
  o  ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1499
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1500
  $ hg fateoriginlog
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1501
  @  0b997eb7ceee
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1502
  |    Obsorigin: reworded using amend from 6:4a004186e638
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1503
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1504
  | *  b18bc8331526
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1505
  |/     Obsorigin: reworded using amend from 6:4a004186e638
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1506
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1507
  | *  ba2ed02b0c9a
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1508
  | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1509
  | x  4a004186e638
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1510
  |/     Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1511
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1512
  *  dd800401bd8c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1513
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1514
  o  f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1515
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1516
  o  ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1517
  
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1518
  $ hg tlog --hidden
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1519
  @  0b997eb7ceee
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1520
  |    Predecessors: 6:4a004186e638
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1521
  |    semi-colon: 6:4a004186e638
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1522
  |    Origin: reworded using amend from 6:4a004186e638
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1523
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1524
  | *  b18bc8331526
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1525
  |/     Predecessors: 6:4a004186e638
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1526
  |      semi-colon: 6:4a004186e638
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1527
  |      Origin: reworded using amend from 6:4a004186e638
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1528
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1529
  | *  ba2ed02b0c9a
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1530
  | |    Predecessors: 4:9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1531
  | |    semi-colon: 4:9bd10a0775e4
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1532
  | |    Origin: split from 4:9bd10a0775e4
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1533
  | |
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1534
  | x  4a004186e638
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1535
  |/     Predecessors: 4:9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1536
  |      semi-colon: 4:9bd10a0775e4
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1537
  |      Successors: 8:b18bc8331526; 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1538
  |      semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1539
  |      Fate: reworded using amend as 8:b18bc8331526
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1540
  |      Fate: reworded using amend as 9:0b997eb7ceee
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1541
  |      Origin: split from 4:9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1542
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1543
  *  dd800401bd8c
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1544
  |    Predecessors: 4:9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1545
  |    semi-colon: 4:9bd10a0775e4
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1546
  |    Origin: split from 4:9bd10a0775e4
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1547
  |
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1548
  | x  9bd10a0775e4
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1549
  |/     Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1550
  |      semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1551
  |      Fate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1552
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1553
  o  f897c6137566
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1554
  |    Predecessors: 2:0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1555
  |    semi-colon: 2:0dec01379d3b
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1556
  |    Origin: rewritten from 2:0dec01379d3b
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1557
  |
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1558
  | x  0dec01379d3b
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1559
  | |    Predecessors: 1:471f378eab4c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1560
  | |    semi-colon: 1:471f378eab4c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1561
  | |    Successors: 3:f897c6137566; 1:471f378eab4c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1562
  | |    semi-colon: 3:f897c6137566; 1:471f378eab4c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1563
  | |    Fate: rewritten as 3:f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1564
  | |    Fate: rewritten as 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1565
  | |    Origin: rewritten from 1:471f378eab4c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1566
  | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1567
  | x  471f378eab4c
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1568
  |/     Predecessors: 2:0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1569
  |      semi-colon: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1570
  |      Successors: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1571
  |      semi-colon: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1572
  |      Fate: rewritten as 2:0dec01379d3b
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1573
  |      Origin: rewritten from 2:0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1574
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1575
  o  ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1576
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1577
  $ hg fateoriginlog --hidden
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1578
  @  0b997eb7ceee
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1579
  |    Obsorigin: reworded using amend from 6:4a004186e638
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1580
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1581
  | *  b18bc8331526
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1582
  |/     Obsorigin: reworded using amend from 6:4a004186e638
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1583
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1584
  | *  ba2ed02b0c9a
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1585
  | |    Obsorigin: split from 4:9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1586
  | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1587
  | x  4a004186e638
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1588
  |/     Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1589
  |      Obsorigin: split from 4:9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1590
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1591
  *  dd800401bd8c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1592
  |    Obsorigin: split from 4:9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1593
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1594
  | x  9bd10a0775e4
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1595
  |/     Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1596
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1597
  o  f897c6137566
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1598
  |    Obsorigin: rewritten from 2:0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1599
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1600
  | x  0dec01379d3b
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1601
  | |    Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1602
  | |    Obsorigin: rewritten from 1:471f378eab4c
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1603
  | |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1604
  | x  471f378eab4c
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1605
  |/     Obsfate: rewritten as 2:0dec01379d3b
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1606
  |      Obsorigin: rewritten from 2:0dec01379d3b
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1607
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1608
  o  ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1609
  
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1610
  $ hg up --hidden 4
3747
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
  1611
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
  1612
  updated to hidden changeset 9bd10a0775e4
3432
f57be161f34b test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3431
diff changeset
  1613
  (hidden revision '9bd10a0775e4' has diverged)
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1614
  working directory parent is obsolete! (9bd10a0775e4)
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1615
  (9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1616
  $ hg rebase -r 7 -d 8 --config extensions.rebase=
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1617
  rebasing 7:ba2ed02b0c9a "Add A,B,C"
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1618
  $ hg tlog
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1619
  *  eceed8f98ffc
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1620
  |    Predecessors: 4:9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1621
  |    semi-colon: 4:9bd10a0775e4
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1622
  |    Origin: rewritten using rebase from 4:9bd10a0775e4
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1623
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1624
  | *  0b997eb7ceee
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1625
  | |    Predecessors: 4:9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1626
  | |    semi-colon: 4:9bd10a0775e4
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1627
  | |    Origin: rewritten using amend from 4:9bd10a0775e4
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1628
  | |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1629
  * |  b18bc8331526
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1630
  |/     Predecessors: 4:9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1631
  |      semi-colon: 4:9bd10a0775e4
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1632
  |      Origin: rewritten using amend from 4:9bd10a0775e4
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1633
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1634
  *  dd800401bd8c
5054
f189a0d5e3df tests: rename precursors to predecessors in test-evolve-templates.t
Anton Shestakov <av6@dwimlabs.net>
parents: 4871
diff changeset
  1635
  |    Predecessors: 4:9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1636
  |    semi-colon: 4:9bd10a0775e4
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1637
  |    Origin: split from 4:9bd10a0775e4
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1638
  |
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1639
  | @  9bd10a0775e4
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1640
  |/     Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1641
  |      semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1642
  |      Fate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1643
  |      Fate: split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1644
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1645
  o  f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1646
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1647
  o  ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1648
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1649
  $ hg fateoriginlog
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1650
  *  eceed8f98ffc
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1651
  |    Obsorigin: rewritten using rebase from 4:9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1652
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1653
  | *  0b997eb7ceee
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1654
  | |    Obsorigin: rewritten using amend from 4:9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1655
  | |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1656
  * |  b18bc8331526
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1657
  |/     Obsorigin: rewritten using amend from 4:9bd10a0775e4
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1658
  |
3417
d3a17c67f85c branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3412
diff changeset
  1659
  *  dd800401bd8c
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1660
  |    Obsorigin: split from 4:9bd10a0775e4
3378
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1661
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1662
  | @  9bd10a0775e4
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1663
  |/     Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1664
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1665
  o  f897c6137566
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1666
  |
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1667
  o  ea207398892e
577bfc34e19b test: add missing cycle test
Boris Feld <boris.feld@octobus.net>
parents: 3360
diff changeset
  1668
  
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1669
Test templates with pruned commits
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1670
==================================
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1671
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1672
Test setup
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1673
----------
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1674
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1675
  $ hg init $TESTTMP/templates-local-prune
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1676
  $ cd $TESTTMP/templates-local-prune
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1677
  $ mkcommit ROOT
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1678
  $ mkcommit A0
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1679
  $ hg prune .
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1680
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4613
30a544904238 messages: standardize on "working copy is now at" including "is"
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1681
  working directory is now at ea207398892e
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1682
  1 changesets pruned
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1683
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1684
Check output
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1685
------------
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1686
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1687
  $ hg up "desc(A0)" --hidden
3747
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
  1688
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3650
diff changeset
  1689
  updated to hidden changeset 471f378eab4c
3432
f57be161f34b test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3431
diff changeset
  1690
  (hidden revision '471f378eab4c' is pruned)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1691
  working directory parent is obsolete! (471f378eab4c)
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1692
  (use 'hg evolve' to update to its parent successor)
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1693
  $ hg tlog
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1694
  @  471f378eab4c
3566
e6bea259c227 prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3564
diff changeset
  1695
  |    Fate: pruned using prune
2591
1991935fb603 obsfate: add a new obsfate template
Boris Feld <boris.feld@octobus.net>
parents: 2590
diff changeset
  1696
  |
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1697
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1698
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1699
  $ hg fateoriginlog -v
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1700
  @  471f378eab4c
3566
e6bea259c227 prune: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents: 3564
diff changeset
  1701
  |    Obsfate: pruned using prune by test (at 1970-01-01 00:00 +0000)
2590
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1702
  |
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1703
  o  ea207398892e
0d7dec71646d obsfate: prepare fatelog tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2589
diff changeset
  1704
  
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1705
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1706
Test templates when having multiple unrelated predecessors
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1707
==========================================================
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1708
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1709
  $ hg init $TESTTMP/templates-local-multipreds
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1710
  $ cd $TESTTMP/templates-local-multipreds
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1711
  $ mkcommit R
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1712
  $ mkcommit A
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1713
  $ mkcommit B
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1714
  $ hg up 'desc(R)'
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1715
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1716
  $ mkcommit C
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1717
  created new head
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1718
  $ hg up 'desc(R)'
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1719
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1720
  $ mkcommit Z
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1721
  created new head
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1722
  $ hg up 'desc(R)'
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1723
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1724
  $ hg prune -r 'desc(A) + desc(B)' -s 'desc(Z)' --fold
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1725
  2 changesets pruned
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1726
  $ hg prune -r 'desc(C)' -s 'desc(Z)'
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1727
  1 changesets pruned
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1728
  $ hg debugobsolete
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
  1729
  944ade52b6a1afe01817e7cae4c3006f1f128279 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
  1730
  36ca49338d3a303e90126c28b1713092aaf3e9ed 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1731
  5b3370228fe5fa9824b8df21cd54876ef23ac745 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1732
  $ hg tlog
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1733
  o  4568aafd15c0
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1734
  |
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1735
  @  7ca5bfdbe243
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1736
  
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1737
  $ hg tlog --hidden
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1738
  o  4568aafd15c0
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1739
  |    Predecessors: 2:36ca49338d3a 3:5b3370228fe5 1:944ade52b6a1
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1740
  |    semi-colon: 2:36ca49338d3a; 3:5b3370228fe5; 1:944ade52b6a1
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
  1741
  |    Origin: rewritten using prune from 2:36ca49338d3a
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1742
  |    Origin: rewritten using prune from 3:5b3370228fe5
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
  1743
  |    Origin: rewritten using prune from 1:944ade52b6a1
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1744
  |
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1745
  | x  5b3370228fe5
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1746
  |/     Successors: 4:4568aafd15c0
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1747
  |      semi-colon: 4:4568aafd15c0
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1748
  |      Fate: rewritten using prune as 4:4568aafd15c0
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1749
  |
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1750
  | x  36ca49338d3a
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1751
  | |    Successors: 4:4568aafd15c0
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1752
  | |    semi-colon: 4:4568aafd15c0
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
  1753
  | |    Fate: rewritten using prune as 4:4568aafd15c0
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1754
  | |
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1755
  | x  944ade52b6a1
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1756
  |/     Successors: 4:4568aafd15c0
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1757
  |      semi-colon: 4:4568aafd15c0
5367
cb5983c0287f test-compat: merge mercurial-4.8 into mercurial-4.7
Anton Shestakov <av6@dwimlabs.net>
parents: 5162 5364
diff changeset
  1758
  |      Fate: rewritten using prune as 4:4568aafd15c0
5330
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1759
  |
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1760
  @  7ca5bfdbe243
0bc31f853862 templatekw: add obsorigin keyword
Anton Shestakov <av6@dwimlabs.net>
parents: 5123
diff changeset
  1761