tests/test-evolve-obshistory-amend.t
author Sushil khanchi <sushilkhanchi97@gmail.com>
Sat, 23 Mar 2019 02:10:31 +0530
changeset 4442 819bad275701
parent 3894 7c624b45fe60
child 3909 f7afd3a158e3
child 4823 c16fed4908d8
permissions -rw-r--r--
evolve: add logic to handle a particular case in divergence resolution Case is: In content divergence, to check if the two csets are on different parent or same parent what we do is find gca of the two csets and then compare it with the singlesuccessors of two csets's parents. Now, if gca is same as singlesuccessors of both the csets then we conclude that both are on the same parent which is not totally correct as it is possible that both the parents of two csets are obsolete with a single successor. This patch adds the logic to cover the above metioned case correctly, deciding the part when we need to relocate a cset to other side while resolving the stack of divergent csets. Changes in test file demonstrate that before this patch we were not doing it right because it should have relocated every node to other side instead of just relocating the first one from the stack.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2289
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     1
This test file test the various messages when accessing obsolete
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     2
revisions.
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     3
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     4
Global setup
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     5
============
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     6
3885
3df8b6ecce2a tests: extract obshistory setup in a separate file
Boris Feld <boris.feld@octobus.net>
parents: 3884
diff changeset
     7
  $ . $TESTDIR/testlib/obshistory_setup.sh
2289
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
     8
3729
1b1badb3d2fc obshistory: make obslog work when a commit doesn't have any description
Anton Shestakov <av6@dwimlabs.net>
parents: 3663
diff changeset
     9
2289
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    10
Test output on amended commit
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    11
=============================
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    12
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    13
Test setup
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    14
----------
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    15
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    16
  $ hg init $TESTTMP/local-amend
3894
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
    17
  $ hg init $TESTTMP/server
2289
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    18
  $ cd $TESTTMP/local-amend
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    19
  $ mkcommit ROOT
3894
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
    20
  $ sync
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
    21
  $ mkcommit A0 .
2289
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    22
  $ echo 42 >> A0
2336
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents: 2290
diff changeset
    23
  $ hg amend -m "A1
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents: 2290
diff changeset
    24
  > 
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents: 2290
diff changeset
    25
  > Better commit message"
3894
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
    26
  $ sync
2289
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    27
  $ hg log --hidden -G
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
    28
  @  changeset:   2:4ae3a4151de9
2289
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    29
  |  tag:         tip
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    30
  |  parent:      0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    31
  |  user:        test
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    32
  |  date:        Thu Jan 01 00:00:00 1970 +0000
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    33
  |  summary:     A1
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    34
  |
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    35
  | x  changeset:   1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    36
  |/   user:        test
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    37
  |    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
    38
  |    obsolete:    rewritten using amend as 2:4ae3a4151de9
2289
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    39
  |    summary:     A0
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    40
  |
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    41
  o  changeset:   0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    42
     user:        test
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    43
     date:        Thu Jan 01 00:00:00 1970 +0000
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    44
     summary:     ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
    45
  
3894
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
    46
Check output on the client side
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
    47
-------------------------------
2637
49f2741c4dd7 obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents: 2585
diff changeset
    48
  $ hg obslog --patch 4ae3a4151de9
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
    49
  @  4ae3a4151de9 (2) A1
2407
783a74c60a5e obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2404
diff changeset
    50
  |
783a74c60a5e obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2404
diff changeset
    51
  x  471f378eab4c (1) A0
3519
2823c82ad8a4 obslog: add the operation to the Obslog output
Boris Feld <boris.feld@octobus.net>
parents: 3432
diff changeset
    52
       rewritten(description, content) as 4ae3a4151de9 using amend by test (*) (glob)
3400
6d345d7ca682 obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3399
diff changeset
    53
         diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3399
diff changeset
    54
         --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3399
diff changeset
    55
         +++ b/changeset-description
2639
a5d8062f55ba obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents: 2637
diff changeset
    56
         @@ -1,1 +1,3 @@
a5d8062f55ba obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents: 2637
diff changeset
    57
         -A0
a5d8062f55ba obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents: 2637
diff changeset
    58
         +A1
a5d8062f55ba obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents: 2637
diff changeset
    59
         +
a5d8062f55ba obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents: 2637
diff changeset
    60
         +Better commit message
a5d8062f55ba obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents: 2637
diff changeset
    61
  
2637
49f2741c4dd7 obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents: 2585
diff changeset
    62
         diff -r 471f378eab4c -r 4ae3a4151de9 A0
49f2741c4dd7 obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents: 2585
diff changeset
    63
         --- a/A0	Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents: 2585
diff changeset
    64
         +++ b/A0	Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents: 2585
diff changeset
    65
         @@ -1,1 +1,2 @@
49f2741c4dd7 obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents: 2585
diff changeset
    66
          A0
49f2741c4dd7 obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents: 2585
diff changeset
    67
         +42
49f2741c4dd7 obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents: 2585
diff changeset
    68
  
2407
783a74c60a5e obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2404
diff changeset
    69
  
3398
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3375
diff changeset
    70
  $ hg obslog --patch --color debug
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3375
diff changeset
    71
  @  [evolve.node|4ae3a4151de9] [evolve.rev|(2)] [evolve.short_description|A1]
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3375
diff changeset
    72
  |
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3375
diff changeset
    73
  x  [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
3519
2823c82ad8a4 obslog: add the operation to the Obslog output
Boris Feld <boris.feld@octobus.net>
parents: 3432
diff changeset
    74
       [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
3400
6d345d7ca682 obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3399
diff changeset
    75
         [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description]
6d345d7ca682 obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3399
diff changeset
    76
         [diff.file_a|--- a/changeset-description]
6d345d7ca682 obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3399
diff changeset
    77
         [diff.file_b|+++ b/changeset-description]
3399
4adf46158b9b obslog: colorize the description diff shown in obslog -p
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3398
diff changeset
    78
         [diff.hunk|@@ -1,1 +1,3 @@]
4adf46158b9b obslog: colorize the description diff shown in obslog -p
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3398
diff changeset
    79
         [diff.deleted|-A0]
4adf46158b9b obslog: colorize the description diff shown in obslog -p
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3398
diff changeset
    80
         [diff.inserted|+A1]
4adf46158b9b obslog: colorize the description diff shown in obslog -p
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3398
diff changeset
    81
         [diff.inserted|+]
4adf46158b9b obslog: colorize the description diff shown in obslog -p
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3398
diff changeset
    82
         [diff.inserted|+Better commit message]
3398
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3375
diff changeset
    83
  
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3375
diff changeset
    84
         [diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 A0]
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3375
diff changeset
    85
         [diff.file_a|--- a/A0	Thu Jan 01 00:00:00 1970 +0000]
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3375
diff changeset
    86
         [diff.file_b|+++ b/A0	Thu Jan 01 00:00:00 1970 +0000]
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3375
diff changeset
    87
         [diff.hunk|@@ -1,1 +1,2 @@]
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3375
diff changeset
    88
          A0
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3375
diff changeset
    89
         [diff.inserted|+42]
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3375
diff changeset
    90
  
d67e6080e11b obslog: colorize the patch shown using `hg obslog -p`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3375
diff changeset
    91
  
2954
54f7b8fcdf3b obslog: fix --patch with --no-graph options
Alain Leufroy
parents: 2929
diff changeset
    92
54f7b8fcdf3b obslog: fix --patch with --no-graph options
Alain Leufroy
parents: 2929
diff changeset
    93
  $ hg obslog --no-graph --patch 4ae3a4151de9
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
    94
  4ae3a4151de9 (2) A1
2954
54f7b8fcdf3b obslog: fix --patch with --no-graph options
Alain Leufroy
parents: 2929
diff changeset
    95
  471f378eab4c (1) A0
3519
2823c82ad8a4 obslog: add the operation to the Obslog output
Boris Feld <boris.feld@octobus.net>
parents: 3432
diff changeset
    96
    rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400
6d345d7ca682 obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3399
diff changeset
    97
      diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3399
diff changeset
    98
      --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3399
diff changeset
    99
      +++ b/changeset-description
2954
54f7b8fcdf3b obslog: fix --patch with --no-graph options
Alain Leufroy
parents: 2929
diff changeset
   100
      @@ -1,1 +1,3 @@
54f7b8fcdf3b obslog: fix --patch with --no-graph options
Alain Leufroy
parents: 2929
diff changeset
   101
      -A0
54f7b8fcdf3b obslog: fix --patch with --no-graph options
Alain Leufroy
parents: 2929
diff changeset
   102
      +A1
54f7b8fcdf3b obslog: fix --patch with --no-graph options
Alain Leufroy
parents: 2929
diff changeset
   103
      +
54f7b8fcdf3b obslog: fix --patch with --no-graph options
Alain Leufroy
parents: 2929
diff changeset
   104
      +Better commit message
3400
6d345d7ca682 obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3399
diff changeset
   105
  
2954
54f7b8fcdf3b obslog: fix --patch with --no-graph options
Alain Leufroy
parents: 2929
diff changeset
   106
      diff -r 471f378eab4c -r 4ae3a4151de9 A0
54f7b8fcdf3b obslog: fix --patch with --no-graph options
Alain Leufroy
parents: 2929
diff changeset
   107
      --- a/A0	Thu Jan 01 00:00:00 1970 +0000
54f7b8fcdf3b obslog: fix --patch with --no-graph options
Alain Leufroy
parents: 2929
diff changeset
   108
      +++ b/A0	Thu Jan 01 00:00:00 1970 +0000
54f7b8fcdf3b obslog: fix --patch with --no-graph options
Alain Leufroy
parents: 2929
diff changeset
   109
      @@ -1,1 +1,2 @@
54f7b8fcdf3b obslog: fix --patch with --no-graph options
Alain Leufroy
parents: 2929
diff changeset
   110
       A0
54f7b8fcdf3b obslog: fix --patch with --no-graph options
Alain Leufroy
parents: 2929
diff changeset
   111
      +42
54f7b8fcdf3b obslog: fix --patch with --no-graph options
Alain Leufroy
parents: 2929
diff changeset
   112
  
54f7b8fcdf3b obslog: fix --patch with --no-graph options
Alain Leufroy
parents: 2929
diff changeset
   113
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   114
  $ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {user|person} ", " also "))}'
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   115
  @  A1
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   116
  |
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   117
  x  A0 at 0 0 by test
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   118
  
2441
80b5fc054219 evolve: adding longer aliases for olog
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents: 2420
diff changeset
   119
  $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
2342
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   120
  [
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   121
      {
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   122
          "markers": [],
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   123
          "node": "4ae3a4151de9",
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   124
          "rev": 2,
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   125
          "shortdescription": "A1"
2342
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   126
      },
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   127
      {
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   128
          "markers": [
2342
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   129
              {
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   130
                  "date": [
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   131
                      *, (glob)
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   132
                      0 (glob)
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   133
                  ],
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   134
                  "effect": [
2585
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents: 2546
diff changeset
   135
                      "description",
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents: 2546
diff changeset
   136
                      "content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file
Boris Feld <boris.feld@octobus.net>
parents: 2546
diff changeset
   137
                  ],
3519
2823c82ad8a4 obslog: add the operation to the Obslog output
Boris Feld <boris.feld@octobus.net>
parents: 3432
diff changeset
   138
                  "operation": "amend",
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   139
                  "succnodes": [
2342
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   140
                      "4ae3a4151de9"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   141
                  ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   142
                  "user": "test",
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   143
                  "verb": "rewritten"
2342
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   144
              }
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   145
          ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   146
          "node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   147
          "rev": 1,
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   148
          "shortdescription": "A0"
2342
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   149
      }
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   150
  ]
2637
49f2741c4dd7 obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents: 2585
diff changeset
   151
  $ hg obslog --hidden --patch 471f378eab4c
2407
783a74c60a5e obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2404
diff changeset
   152
  x  471f378eab4c (1) A0
3559
d166b3dc5e8a tests: do not glob out fixed dates
Martin von Zweigbergk <martinvonz@google.com>
parents: 3519
diff changeset
   153
       rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400
6d345d7ca682 obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3399
diff changeset
   154
         diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3399
diff changeset
   155
         --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3399
diff changeset
   156
         +++ b/changeset-description
2639
a5d8062f55ba obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents: 2637
diff changeset
   157
         @@ -1,1 +1,3 @@
a5d8062f55ba obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents: 2637
diff changeset
   158
         -A0
a5d8062f55ba obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents: 2637
diff changeset
   159
         +A1
a5d8062f55ba obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents: 2637
diff changeset
   160
         +
a5d8062f55ba obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents: 2637
diff changeset
   161
         +Better commit message
a5d8062f55ba obslog: also display description patch with --patch
Boris Feld <boris.feld@octobus.net>
parents: 2637
diff changeset
   162
  
2637
49f2741c4dd7 obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents: 2585
diff changeset
   163
         diff -r 471f378eab4c -r 4ae3a4151de9 A0
49f2741c4dd7 obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents: 2585
diff changeset
   164
         --- a/A0	Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents: 2585
diff changeset
   165
         +++ b/A0	Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents: 2585
diff changeset
   166
         @@ -1,1 +1,2 @@
49f2741c4dd7 obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents: 2585
diff changeset
   167
          A0
49f2741c4dd7 obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents: 2585
diff changeset
   168
         +42
49f2741c4dd7 obslog: add a patch option
Boris Feld <boris.feld@octobus.net>
parents: 2585
diff changeset
   169
  
2407
783a74c60a5e obshistory: add a graph option on the debugobshistory command
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 2404
diff changeset
   170
  
2477
d7f7e8f3b51c test: rename all olog references
Boris Feld <boris.feld@octobus.net>
parents: 2476
diff changeset
   171
  $ hg obslog --hidden 471f378eab4c --no-graph -Tjson | python -m json.tool
2342
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   172
  [
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   173
      {
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   174
          "markers": [
2342
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   175
              {
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   176
                  "date": [
2342
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   177
                      *, (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   178
                      0 (glob)
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   179
                  ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   180
                  "effect": [
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   181
                      *, (glob)
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   182
                      "content"
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   183
                  ],
3519
2823c82ad8a4 obslog: add the operation to the Obslog output
Boris Feld <boris.feld@octobus.net>
parents: 3432
diff changeset
   184
                  "operation": "amend",
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   185
                  "succnodes": [
2342
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   186
                      "4ae3a4151de9"
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   187
                  ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   188
                  "user": "test",
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   189
                  "verb": "rewritten"
2342
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   190
              }
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   191
          ],
2957
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   192
          "node": "471f378eab4c",
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   193
          "rev": 1,
586c9ace20b3 obslog: simplify formatter keys
Alain Leufroy
parents: 2956
diff changeset
   194
          "shortdescription": "A0"
2342
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   195
      }
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command
Boris Feld <boris.feld@octobus.net>
parents: 2336
diff changeset
   196
  ]
2290
a36a8c6a09ac ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents: 2289
diff changeset
   197
  $ hg update 471f378eab4c
3663
54a469cd5b26 test: update output to match upstream
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3567
diff changeset
   198
  abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9!
54a469cd5b26 test: update output to match upstream
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3567
diff changeset
   199
  (use --hidden to access hidden revisions)
2290
a36a8c6a09ac ui: change the hidden revision error message
Boris Feld <boris.feld@octobus.net>
parents: 2289
diff changeset
   200
  [255]
2289
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   201
  $ hg update --hidden "desc(A0)"
3747
1e103c7f7663 test: update to new outputs
Boris Feld <boris.feld@octobus.net>
parents: 3730
diff changeset
   202
  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: 3730
diff changeset
   203
  updated to hidden changeset 471f378eab4c
3432
f57be161f34b test: update with new 'update' hint about obsfate
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3417
diff changeset
   204
  (hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9)
2289
61d073590fb7 ui: add better messages when the working copy become obsolete.
Boris Feld <boris.feld@octobus.net>
parents:
diff changeset
   205
  working directory parent is obsolete! (471f378eab4c)
2336
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs
Boris Feld <boris.feld@octobus.net>
parents: 2290
diff changeset
   206
  (use 'hg evolve' to update to its successor: 4ae3a4151de9)
3894
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   207
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   208
Check output on the server side
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   209
-------------------------------
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   210
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   211
  $ hg obslog -R $TESTTMP/server --patch 4ae3a4151de9
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   212
  o  4ae3a4151de9 (1) A1
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   213
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   214
  x  471f378eab4c
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   215
       rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   216
         (No patch available, context is not local)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   217
  
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   218
  $ hg obslog -R $TESTTMP/server -f --patch 4ae3a4151de9
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   219
  o  4ae3a4151de9 (1) A1
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   220
  
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   221
  $ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   222
  4ae3a4151de9 (1) A1
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   223
  471f378eab4c
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   224
    rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   225
      (No patch available, context is not local)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   226
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   227
  $ hg obslog -R $TESTTMP/server --no-graph -f --patch 4ae3a4151de9
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   228
  4ae3a4151de9 (1) A1
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   229
  471f378eab4c
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   230
    rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   231
      (No patch available, context is not local)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   232
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   233
Amend two more times
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   234
====================
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   235
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   236
Amend again
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   237
-----------
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   238
  $ hg log --hidden -G
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   239
  o  changeset:   2:4ae3a4151de9
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   240
  |  tag:         tip
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   241
  |  parent:      0:ea207398892e
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   242
  |  user:        test
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   243
  |  date:        Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   244
  |  summary:     A1
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   245
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   246
  | @  changeset:   1:471f378eab4c
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   247
  |/   user:        test
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   248
  |    date:        Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   249
  |    obsolete:    rewritten using amend as 2:4ae3a4151de9
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   250
  |    summary:     A0
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   251
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   252
  o  changeset:   0:ea207398892e
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   253
     user:        test
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   254
     date:        Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   255
     summary:     ROOT
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   256
  
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   257
  $ hg up tip
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   258
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   259
  $ hg amend -m "A2
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   260
  > 
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   261
  > Better better commit message"
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   262
  $ hg amend -m "A3
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   263
  > 
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   264
  > Better better better commit message"
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   265
  $ sync
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   266
  $ hg log --hidden -G
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   267
  @  changeset:   4:92210308515b
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   268
  |  tag:         tip
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   269
  |  parent:      0:ea207398892e
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   270
  |  user:        test
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   271
  |  date:        Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   272
  |  summary:     A3
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   273
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   274
  | x  changeset:   3:4f1685185907
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   275
  |/   parent:      0:ea207398892e
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   276
  |    user:        test
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   277
  |    date:        Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   278
  |    obsolete:    reworded using amend as 4:92210308515b
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   279
  |    summary:     A2
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   280
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   281
  | x  changeset:   2:4ae3a4151de9
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   282
  |/   parent:      0:ea207398892e
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   283
  |    user:        test
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   284
  |    date:        Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   285
  |    obsolete:    reworded using amend as 3:4f1685185907
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   286
  |    summary:     A1
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   287
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   288
  | x  changeset:   1:471f378eab4c
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   289
  |/   user:        test
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   290
  |    date:        Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   291
  |    obsolete:    rewritten using amend as 2:4ae3a4151de9
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   292
  |    summary:     A0
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   293
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   294
  o  changeset:   0:ea207398892e
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   295
     user:        test
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   296
     date:        Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   297
     summary:     ROOT
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   298
  
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   299
Check the output on the client
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   300
------------------------------
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   301
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   302
  $ hg obslog --patch 92210308515b
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   303
  @  92210308515b (4) A3
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   304
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   305
  x  4f1685185907 (3) A2
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   306
  |    rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   307
  |      diff -r 4f1685185907 -r 92210308515b changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   308
  |      --- a/changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   309
  |      +++ b/changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   310
  |      @@ -1,3 +1,3 @@
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   311
  |      -A2
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   312
  |      +A3
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   313
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   314
  |      -Better better commit message
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   315
  |      +Better better better commit message
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   316
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   317
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   318
  x  4ae3a4151de9 (2) A1
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   319
  |    rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   320
  |      diff -r 4ae3a4151de9 -r 4f1685185907 changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   321
  |      --- a/changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   322
  |      +++ b/changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   323
  |      @@ -1,3 +1,3 @@
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   324
  |      -A1
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   325
  |      +A2
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   326
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   327
  |      -Better commit message
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   328
  |      +Better better commit message
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   329
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   330
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   331
  x  471f378eab4c (1) A0
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   332
       rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   333
         diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   334
         --- a/changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   335
         +++ b/changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   336
         @@ -1,1 +1,3 @@
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   337
         -A0
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   338
         +A1
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   339
         +
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   340
         +Better commit message
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   341
  
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   342
         diff -r 471f378eab4c -r 4ae3a4151de9 A0
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   343
         --- a/A0	Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   344
         +++ b/A0	Thu Jan 01 00:00:00 1970 +0000
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   345
         @@ -1,1 +1,2 @@
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   346
          A0
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   347
         +42
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   348
  
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   349
  
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   350
Check the output on the server
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   351
------------------------------
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   352
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   353
  $ hg obslog -R $TESTTMP/server --patch 92210308515b
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   354
  o  92210308515b (2) A3
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   355
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   356
  x  4f1685185907
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   357
  |    rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   358
  |      (No patch available, context is not local)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   359
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   360
  x  4ae3a4151de9 (1) A1
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   361
  |    rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   362
  |      (No patch available, successor is unknown locally)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   363
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   364
  x  471f378eab4c
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   365
       rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   366
         (No patch available, context is not local)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   367
  
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   368
  $ hg obslog -R $TESTTMP/server -f --patch 92210308515b
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   369
  o  92210308515b (2) A3
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   370
  |
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   371
  x  4ae3a4151de9 (1) A1
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   372
       reworded(description) as 92210308515b using amend by test (at Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   373
         diff -r 4ae3a4151de9 -r 92210308515b changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   374
         --- a/changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   375
         +++ b/changeset-description
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   376
         @@ -1,3 +1,3 @@
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   377
         -A1
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   378
         +A3
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   379
  
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   380
         -Better commit message
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   381
         +Better better better commit message
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   382
  
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   383
  
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   384
  $ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   385
  92210308515b (2) A3
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   386
  4f1685185907
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   387
    rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   388
      (No patch available, context is not local)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   389
  4ae3a4151de9 (1) A1
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   390
    rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   391
      (No patch available, successor is unknown locally)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   392
  471f378eab4c
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   393
    rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   394
      (No patch available, context is not local)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   395
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   396
  $ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   397
  92210308515b (2) A3
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   398
  4f1685185907
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   399
    rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   400
      (No patch available, context is not local)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   401
  4ae3a4151de9 (1) A1
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   402
    rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   403
      (No patch available, successor is unknown locally)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   404
  471f378eab4c
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   405
    rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
7c624b45fe60 obslog: check filtered output with amended changesets
Boris Feld <boris.feld@octobus.net>
parents: 3886
diff changeset
   406
      (No patch available, context is not local)