tests/test-evolve-issue5958.t
author Anton Shestakov <av6@dwimlabs.net>
Thu, 23 Jan 2020 17:40:59 +0700
branchmercurial-4.6
changeset 5091 308c1e09f80f
parent 4998 88b816a9d990
permissions -rw-r--r--
test-compat: merge mercurial-4.7 into mercurial-4.6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4849
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     1
Content divergence and trying to relocate a node on top of itself (issue5958)
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     2
https://bz.mercurial-scm.org/show_bug.cgi?id=5958
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     3
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     4
  $ . $TESTDIR/testlib/common.sh
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     5
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     6
  $ cat << EOF >> $HGRCPATH
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     7
  > [extensions]
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     8
  > rebase =
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
     9
  > evolve =
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    10
  > EOF
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    11
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    12
  $ hg init issue5958
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    13
  $ cd issue5958
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    14
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    15
  $ echo hi > r0
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    16
  $ hg ci -qAm 'add r0'
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    17
  $ echo hi > foo.txt
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    18
  $ hg ci -qAm 'add foo.txt'
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    19
  $ hg metaedit -r . -d '0 2'
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    20
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    21
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    22
(Make changes in unrelated files so that we don't have any merge conflicts
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    23
during the rebase, but the two touched revisions aren't identical)
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    24
4995
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
    25
date: updated on both side to the same value
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
    26
4849
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    27
  $ echo hi > bar.txt
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    28
  $ hg add -q bar.txt
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    29
  $ hg amend -q
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    30
  $ hg metaedit -r 1 -d '0 1' --hidden
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    31
  2 new content-divergent changesets
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    32
  $ hg log -r tip
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    33
  changeset:   4:c17bf400a278
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    34
  tag:         tip
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    35
  parent:      0:a24ed8ad918c
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    36
  user:        test
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    37
  date:        Wed Dec 31 23:59:59 1969 -0000
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    38
  instability: content-divergent
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    39
  summary:     add foo.txt
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    40
  
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    41
  $ echo hi > baz.txt
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    42
  $ hg add -q baz.txt
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    43
  $ hg amend -q
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    44
  $ hg rebase -qr tip -d 4
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    45
  $ hg log -G
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    46
  @  changeset:   6:08bc7ba82799
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    47
  |  tag:         tip
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    48
  |  parent:      4:c17bf400a278
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    49
  |  user:        test
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    50
  |  date:        Wed Dec 31 23:59:58 1969 -0000
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    51
  |  instability: content-divergent
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    52
  |  summary:     add foo.txt
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    53
  |
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    54
  *  changeset:   4:c17bf400a278
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    55
  |  parent:      0:a24ed8ad918c
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    56
  |  user:        test
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    57
  |  date:        Wed Dec 31 23:59:59 1969 -0000
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    58
  |  instability: content-divergent
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    59
  |  summary:     add foo.txt
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    60
  |
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    61
  o  changeset:   0:a24ed8ad918c
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    62
     user:        test
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    63
     date:        Thu Jan 01 00:00:00 1970 +0000
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    64
     summary:     add r0
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    65
  
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    66
  $ hg obslog -a -r .
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    67
  @  08bc7ba82799 (6) add foo.txt
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    68
  |
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    69
  | *  c17bf400a278 (4) add foo.txt
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    70
  | |
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    71
  x |  1d1fc409af98 (5) add foo.txt
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    72
  | |    rewritten(parent, content) as 08bc7ba82799 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    73
  | |
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    74
  x |  a25dd7af6cf6 (3) add foo.txt
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    75
  | |    rewritten(content) as 1d1fc409af98 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    76
  | |
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    77
  x |  0065551bd38f (2) add foo.txt
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    78
  |/     rewritten(content) as a25dd7af6cf6 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    79
  |
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    80
  x  cc71ffbc7c00 (1) add foo.txt
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    81
       rewritten(date) as 0065551bd38f using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    82
       rewritten(date) as c17bf400a278 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    83
  
4994
8b6e2565aaf3 test: highlight data handling when solving divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4850
diff changeset
    84
  $ hg evolve --list --rev .
8b6e2565aaf3 test: highlight data handling when solving divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4850
diff changeset
    85
  08bc7ba82799: add foo.txt
8b6e2565aaf3 test: highlight data handling when solving divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4850
diff changeset
    86
    content-divergent: c17bf400a278 (draft) (precursor cc71ffbc7c00)
8b6e2565aaf3 test: highlight data handling when solving divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4850
diff changeset
    87
  
8b6e2565aaf3 test: highlight data handling when solving divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4850
diff changeset
    88
  $ hg log --hidden -r cc71ffbc7c00 -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
8b6e2565aaf3 test: highlight data handling when solving divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4850
diff changeset
    89
  1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f
8b6e2565aaf3 test: highlight data handling when solving divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4850
diff changeset
    90
  $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
8b6e2565aaf3 test: highlight data handling when solving divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4850
diff changeset
    91
  4 c17bf400a278 1969-12-31 23:59 -0000: 
8b6e2565aaf3 test: highlight data handling when solving divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4850
diff changeset
    92
  6 08bc7ba82799 1969-12-31 23:59 -0000: 
4850
6d898fa6e5c3 evolve: check that relocating makes sense in _solvedivergent() (issue5958)
Anton Shestakov <av6@dwimlabs.net>
parents: 4849
diff changeset
    93
  $ hg evolve --content-divergent
4849
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    94
  merge:[6] add foo.txt
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    95
  with: [4] add foo.txt
b9b6f421688a tests: demonstrate content divergence causing "relocate node on top of itself"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset
    96
  base: [1] add foo.txt
4850
6d898fa6e5c3 evolve: check that relocating makes sense in _solvedivergent() (issue5958)
Anton Shestakov <av6@dwimlabs.net>
parents: 4849
diff changeset
    97
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
6d898fa6e5c3 evolve: check that relocating makes sense in _solvedivergent() (issue5958)
Anton Shestakov <av6@dwimlabs.net>
parents: 4849
diff changeset
    98
  1 new orphan changesets
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
    99
  working directory is now at 459c64f7eaad
4994
8b6e2565aaf3 test: highlight data handling when solving divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4850
diff changeset
   100
  $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   101
  4 c17bf400a278 1969-12-31 23:59 -0000: rewritten using evolve as 7:459c64f7eaad
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   102
  7 459c64f7eaad 1969-12-31 23:59 -0000: 
4995
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   103
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   104
date: updated one one side to an older value
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   105
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   106
  $ hg evolve -r .
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   107
  move:[7] add foo.txt
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   108
  atop:[0] add r0
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   109
  working directory is now at 545776b4e79f
4995
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   110
  $ hg update --hidden --rev 'predecessors(.)'
5091
308c1e09f80f test-compat: merge mercurial-4.7 into mercurial-4.6
Anton Shestakov <av6@dwimlabs.net>
parents: 4998
diff changeset
   111
  updating to a hidden changeset 459c64f7eaad
308c1e09f80f test-compat: merge mercurial-4.7 into mercurial-4.6
Anton Shestakov <av6@dwimlabs.net>
parents: 4998
diff changeset
   112
  (hidden revision '459c64f7eaad' was rewritten as: 545776b4e79f)
4995
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   113
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   114
  working directory parent is obsolete! (459c64f7eaad)
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   115
  (use 'hg evolve' to update to its successor: 545776b4e79f)
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   116
  $ hg amend --date "0 3"
4995
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   117
  1 new orphan changesets
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   118
  2 new content-divergent changesets
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   119
  $ hg rebase -r . -d 0
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   120
  rebasing 9:c117f15338e6 "add foo.txt" (tip)
4995
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   121
  $ hg log -G
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   122
  @  changeset:   10:7a09c7a39546
4995
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   123
  |  tag:         tip
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   124
  |  parent:      0:a24ed8ad918c
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   125
  |  user:        test
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   126
  |  date:        Wed Dec 31 23:59:57 1969 -0000
4995
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   127
  |  instability: content-divergent
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   128
  |  summary:     add foo.txt
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   129
  |
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   130
  | *  changeset:   8:545776b4e79f
4995
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   131
  |/   parent:      0:a24ed8ad918c
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   132
  |    user:        test
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   133
  |    date:        Wed Dec 31 23:59:58 1969 -0000
4995
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   134
  |    instability: content-divergent
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   135
  |    summary:     add foo.txt
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   136
  |
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   137
  o  changeset:   0:a24ed8ad918c
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   138
     user:        test
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   139
     date:        Thu Jan 01 00:00:00 1970 +0000
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   140
     summary:     add r0
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   141
  
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   142
  $ hg evolve --list -r .
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   143
  7a09c7a39546: add foo.txt
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   144
    content-divergent: 545776b4e79f (draft) (precursor 459c64f7eaad)
4995
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   145
  
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   146
  $ hg log -r 459c64f7eaad+7a09c7a39546+545776b4e79f --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   147
  7 459c64f7eaad 1969-12-31 23:59 -0000: date-changed using amend as 9:c117f15338e6; rebased using evolve as 8:545776b4e79f
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   148
  10 7a09c7a39546 1969-12-31 23:59 -0000: 
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   149
  8 545776b4e79f 1969-12-31 23:59 -0000: 
4995
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   150
  $ hg evolve --content-divergent
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   151
  merge:[8] add foo.txt
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   152
  with: [10] add foo.txt
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   153
  base: [7] add foo.txt
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   154
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   155
  working directory is now at 39c4200c0d94
4995
d31d39ea0fe4 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4994
diff changeset
   156
  $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   157
  11 39c4200c0d94 1969-12-31 23:59 -0000: 
4996
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   158
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   159
date: updated one side to an newer value
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   160
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   161
  $ hg update --hidden --rev 'predecessors(.)'
5091
308c1e09f80f test-compat: merge mercurial-4.7 into mercurial-4.6
Anton Shestakov <av6@dwimlabs.net>
parents: 4998
diff changeset
   162
  updating to a hidden changeset 7a09c7a39546
308c1e09f80f test-compat: merge mercurial-4.7 into mercurial-4.6
Anton Shestakov <av6@dwimlabs.net>
parents: 4998
diff changeset
   163
  (hidden revision '7a09c7a39546' was rewritten as: 39c4200c0d94)
4996
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   164
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   165
  working directory parent is obsolete! (7a09c7a39546)
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   166
  (use 'hg evolve' to update to its successor: 39c4200c0d94)
4996
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   167
  $ hg amend --date "120 0"
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   168
  2 new content-divergent changesets
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   169
  $ hg log -G
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   170
  @  changeset:   12:da3be3d72fe2
4996
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   171
  |  tag:         tip
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   172
  |  parent:      0:a24ed8ad918c
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   173
  |  user:        test
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   174
  |  date:        Thu Jan 01 00:02:00 1970 +0000
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   175
  |  instability: content-divergent
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   176
  |  summary:     add foo.txt
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   177
  |
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   178
  | *  changeset:   11:39c4200c0d94
4996
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   179
  |/   parent:      0:a24ed8ad918c
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   180
  |    user:        test
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   181
  |    date:        Wed Dec 31 23:59:57 1969 -0000
4996
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   182
  |    instability: content-divergent
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   183
  |    summary:     add foo.txt
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   184
  |
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   185
  o  changeset:   0:a24ed8ad918c
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   186
     user:        test
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   187
     date:        Thu Jan 01 00:00:00 1970 +0000
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   188
     summary:     add r0
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   189
  
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   190
  $ hg evolve --list -r .
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   191
  da3be3d72fe2: add foo.txt
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   192
    content-divergent: 39c4200c0d94 (draft) (precursor 7a09c7a39546)
4996
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   193
  
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   194
  $ hg up 39c4200c0d94
4996
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   195
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   196
  $ hg log -r 7a09c7a39546+39c4200c0d94+da3be3d72fe2 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   197
  10 7a09c7a39546 1969-12-31 23:59 -0000: date-changed using amend as 12:da3be3d72fe2; rewritten using evolve as 11:39c4200c0d94
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   198
  11 39c4200c0d94 1969-12-31 23:59 -0000: 
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   199
  12 da3be3d72fe2 1970-01-01 00:02 +0000: 
4996
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   200
  $ hg evolve --content-divergent
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   201
  merge:[11] add foo.txt
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   202
  with: [12] add foo.txt
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   203
  base: [10] add foo.txt
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   204
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   205
  working directory is now at 06cde6010a51
4996
6061995cfad0 test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4995
diff changeset
   206
  $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   207
  13 06cde6010a51 1970-01-01 00:02 +0000: 
4997
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   208
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   209
date: updated each side to a different value, newer should win
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   210
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   211
  $ hg amend --date "235 0"
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   212
  $ hg update --hidden --rev 'predecessors(.)'
5091
308c1e09f80f test-compat: merge mercurial-4.7 into mercurial-4.6
Anton Shestakov <av6@dwimlabs.net>
parents: 4998
diff changeset
   213
  updating to a hidden changeset 06cde6010a51
308c1e09f80f test-compat: merge mercurial-4.7 into mercurial-4.6
Anton Shestakov <av6@dwimlabs.net>
parents: 4998
diff changeset
   214
  (hidden revision '06cde6010a51' was rewritten as: a7412ff9bfb3)
4997
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   215
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   216
  working directory parent is obsolete! (06cde6010a51)
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   217
  (use 'hg evolve' to update to its successor: a7412ff9bfb3)
4997
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   218
  $ hg amend --date "784 0"
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   219
  2 new content-divergent changesets
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   220
  $ hg log -G
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   221
  @  changeset:   15:e3077936ec52
4997
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   222
  |  tag:         tip
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   223
  |  parent:      0:a24ed8ad918c
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   224
  |  user:        test
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   225
  |  date:        Thu Jan 01 00:13:04 1970 +0000
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   226
  |  instability: content-divergent
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   227
  |  summary:     add foo.txt
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   228
  |
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   229
  | *  changeset:   14:a7412ff9bfb3
4997
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   230
  |/   parent:      0:a24ed8ad918c
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   231
  |    user:        test
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   232
  |    date:        Thu Jan 01 00:03:55 1970 +0000
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   233
  |    instability: content-divergent
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   234
  |    summary:     add foo.txt
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   235
  |
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   236
  o  changeset:   0:a24ed8ad918c
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   237
     user:        test
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   238
     date:        Thu Jan 01 00:00:00 1970 +0000
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   239
     summary:     add r0
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   240
  
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   241
  $ hg evolve --list -r .
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   242
  e3077936ec52: add foo.txt
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   243
    content-divergent: a7412ff9bfb3 (draft) (precursor 06cde6010a51)
4997
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   244
  
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   245
  $ hg log -r 39c4200c0d94+a7412ff9bfb3+e3077936ec52 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   246
  11 39c4200c0d94 1969-12-31 23:59 -0000: date-changed using evolve as 13:06cde6010a51
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   247
  14 a7412ff9bfb3 1970-01-01 00:03 +0000: 
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   248
  15 e3077936ec52 1970-01-01 00:13 +0000: 
4997
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   249
  $ hg evolve --content-divergent
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   250
  merge:[14] add foo.txt
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   251
  with: [15] add foo.txt
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   252
  base: [13] add foo.txt
4997
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   253
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   254
  working directory is now at 1a39f3901288
4997
e989d109ca9c test: add test for content divergence involving a date update
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4996
diff changeset
   255
  $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
4998
88b816a9d990 evolve: preserve date when resolving content-divergence (issue6202)
Manuel Jacob <me@manueljacob.de>
parents: 4997
diff changeset
   256
  16 1a39f3901288 1970-01-01 00:13 +0000: