tests/test-evolve-content-divergent-meta.t
author Anton Shestakov <av6@dwimlabs.net>
Tue, 10 Mar 2020 19:05:08 +0700
changeset 5193 a4d081923c81
parent 5079 1f92a6aa40d6
child 5163 1752a2e7a226
child 5341 13376ca93fa3
permissions -rw-r--r--
compat: update hg-X.Y compat comments and test them
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4482
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     1
+====================================================
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     2
+Tests the resolution of content divergence: metadata
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     3
+====================================================
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     4
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     5
This file intend to cover cases focused around meta data merging.
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     6
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     7
Setup
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     8
-----
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     9
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    10
  $ cat >> $HGRCPATH <<EOF
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    11
  > [alias]
4625
a4fde4e3e763 templatekw: add `instabilities` alias for `troubles`
Matt Harbison <matt_harbison@yahoo.com>
parents: 4577
diff changeset
    12
  > glog = log -GT "{rev}:{node|short} {desc|firstline}\n {phase} {instabilities}\n\n"
4482
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    13
  > [phases]
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    14
  > publish = False
5079
1f92a6aa40d6 evolve: add pre-check logic for content-divergence in rewriteutil.precheck()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5013
diff changeset
    15
  > [experimental]
1f92a6aa40d6 evolve: add pre-check logic for content-divergence in rewriteutil.precheck()
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 5013
diff changeset
    16
  > evolution.allowdivergence = True
4482
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    17
  > [extensions]
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    18
  > rebase =
5013
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
    19
  > strip =
4482
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    20
  > EOF
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    21
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    22
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    23
Check we preserve the author properly
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    24
-------------------------------------
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    25
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    26
Testing issue6113 to make sure that content-divergence resolution don't
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    27
replace initial author with the user running the resolution command:
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    28
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    29
  $ hg init userfoo
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    30
  $ cd userfoo
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    31
  $ unset HGUSER
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    32
  $ echo "[ui]" >> ./.hg/hgrc
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    33
  $ echo "username = foo <foo@test.com>" >> ./.hg/hgrc
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    34
  $ for ch in a b c; do
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    35
  > echo $ch > $ch;
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    36
  > hg add $ch;
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    37
  > hg ci -m "added "$ch;
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    38
  > done;
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    39
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    40
  $ cd ..
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    41
  $ hg init userbar
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    42
  $ cd userbar
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    43
  $ unset HGUSER
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    44
  $ echo "[ui]" >> ./.hg/hgrc
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    45
  $ echo "username = bar <bar@test.com>" >> ./.hg/hgrc
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    46
  $ hg pull ./../userfoo -q
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    47
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    48
  $ cd ../userfoo
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    49
  $ hg up -r "desc('added b')"
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    50
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    51
  $ echo c > c
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    52
  $ echo e > e
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    53
  $ hg add c e
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    54
  $ hg ci -m "added c e"
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    55
  created new head
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    56
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    57
  $ hg up -r "desc('added b')"
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    58
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    59
  $ echo cc > c
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    60
  $ hg add c
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    61
  $ hg ci -m "added c"
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    62
  created new head
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    63
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    64
  $ hg prune -r "min(desc('added c'))" -s "desc('added c e')"
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    65
  1 changesets pruned
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    66
  $ hg prune -r "min(desc('added c'))" -s "max(desc('added c'))" --hidden
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    67
  1 changesets pruned
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    68
  2 new content-divergent changesets
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    69
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    70
  $ hg glog
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    71
  @  4:6c06cda6dc99 added c
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    72
  |   draft content-divergent
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    73
  |
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    74
  | *  3:0c9267e23c9d added c e
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    75
  |/    draft content-divergent
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    76
  |
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    77
  o  1:1740ad2a1eda added b
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    78
  |   draft
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    79
  |
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    80
  o  0:f863f39764c4 added a
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    81
      draft
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    82
  
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    83
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    84
  $ cd ../userbar
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    85
  $ hg pull ./../userfoo -q
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    86
  2 new content-divergent changesets
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    87
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    88
  $ hg evolve --content-divergent --any
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    89
  merge:[3] added c e
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    90
  with: [4] added c
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    91
  base: [2] added c
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    92
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    93
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    94
Make sure resultant cset don't replace the initial user with user running the command:
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    95
  $ hg log -r tip
4483
7978230faa32 evolve: make sure div resolution don't replace the initial author (issue6113)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4482
diff changeset
    96
  changeset:   5:443bd2972210
4482
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    97
  tag:         tip
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    98
  parent:      1:1740ad2a1eda
4483
7978230faa32 evolve: make sure div resolution don't replace the initial author (issue6113)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4482
diff changeset
    99
  user:        foo <foo@test.com>
4482
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   100
  date:        Thu Jan 01 00:00:00 1970 +0000
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   101
  summary:     added c e
ee7e4e05ce44 evolve: add test which demonstrate issue6113
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   102
  
4635
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   103
  $ cd ..
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   104
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   105
Testing the three way merge logic for user of content divergent changesets
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   106
--------------------------------------------------------------------------
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   107
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   108
  $ hg init mergeusers
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   109
  $ cd mergeusers
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   110
  $ for ch in a b c; do
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   111
  > touch $ch
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   112
  > hg add $ch
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   113
  > hg ci -m "added "$ch
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   114
  > done;
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   115
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   116
  $ hg amend -m "updated c"
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   117
  $ hg up -r 'desc("added c")' --hidden -q
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   118
  updated to hidden changeset 2b3c31fe982d
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   119
  (hidden revision '2b3c31fe982d' was rewritten as: 464e35020fd0)
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   120
  working directory parent is obsolete! (2b3c31fe982d)
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   121
  $ echo coco > c
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   122
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   123
1) when one user is different wrt base
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   124
--------------------------------------
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   125
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   126
Insert a diverging author name:
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   127
  $ hg amend -u 'foouser'
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   128
  2 new content-divergent changesets
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   129
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   130
Run automatic evolution:
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   131
  $ hg evolve --content-divergent
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   132
  merge:[3] updated c
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   133
  with: [4] added c
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   134
  base: [2] added c
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   135
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   136
  working directory is now at 932d6ceb7672
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   137
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   138
  $ hg log -r tip | grep "^user"
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   139
  user:        foouser
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   140
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   141
  $ hg strip . -q --config extensions.strip=
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   142
  2 new content-divergent changesets
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   143
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   144
2) when both the user are different wrt base
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   145
--------------------------------------------
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   146
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   147
  $ hg up -r 'max(desc("updated c"))'
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   148
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   149
  $ hg amend -u 'baruser'
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   150
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   151
Run automatic evolution:
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   152
  $ hg evolve --content-divergent
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   153
  merge:[4] added c
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   154
  with: [5] updated c
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   155
  base: [2] added c
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   156
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4636
c0e9a3c01c44 evolve: consider using three way merge to get the user for div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4635
diff changeset
   157
  working directory is now at 202a770d8c1f
4635
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   158
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   159
  $ hg log -r tip | grep "^user"
4636
c0e9a3c01c44 evolve: consider using three way merge to get the user for div resolution
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4635
diff changeset
   160
  user:        baruser, foouser
4635
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   161
ea9ae2d2095a evolve: add tests for the case when div csets has different users
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4633
diff changeset
   162
  $ cd ..
5013
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   163
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   164
Test the content-divergence resolution involving date update
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   165
------------------------------------------------------------
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   166
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   167
  $ hg init divergingdate
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   168
  $ cd divergingdate
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   169
  $ unset HGUSER
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   170
  $ echo "[ui]" >> ./.hg/hgrc
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   171
  $ echo "username = test" >> ./.hg/hgrc
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   172
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   173
  $ echo hi > r0
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   174
  $ hg ci -qAm 'add r0'
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   175
  $ echo hi > foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   176
  $ hg ci -qAm 'add foo.txt'
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   177
  $ hg metaedit -r . -d '0 2'
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   178
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   179
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   180
date: updated on both side to the same value
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   181
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   182
  $ echo hi > bar.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   183
  $ hg add -q bar.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   184
  $ hg amend -q
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   185
  $ hg metaedit -r 1 -d '0 1' --hidden
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   186
  2 new content-divergent changesets
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   187
  $ hg log -G
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   188
  *  changeset:   4:c17bf400a278
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   189
  |  tag:         tip
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   190
  |  parent:      0:a24ed8ad918c
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   191
  |  user:        test
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   192
  |  date:        Wed Dec 31 23:59:59 1969 -0000
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   193
  |  instability: content-divergent
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   194
  |  summary:     add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   195
  |
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   196
  | @  changeset:   3:a25dd7af6cf6
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   197
  |/   parent:      0:a24ed8ad918c
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   198
  |    user:        test
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   199
  |    date:        Wed Dec 31 23:59:58 1969 -0000
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   200
  |    instability: content-divergent
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   201
  |    summary:     add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   202
  |
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   203
  o  changeset:   0:a24ed8ad918c
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   204
     user:        test
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   205
     date:        Thu Jan 01 00:00:00 1970 +0000
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   206
     summary:     add r0
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   207
  
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   208
  $ hg evolve --list --rev .
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   209
  a25dd7af6cf6: add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   210
    content-divergent: c17bf400a278 (draft) (precursor cc71ffbc7c00)
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   211
  
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   212
  $ hg log --hidden -r cc71ffbc7c00 -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   213
  1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   214
  $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   215
  3 a25dd7af6cf6 1969-12-31 23:59 -0000: 
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   216
  4 c17bf400a278 1969-12-31 23:59 -0000: 
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   217
  $ hg evolve --content-divergent
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   218
  merge:[3] add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   219
  with: [4] add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   220
  base: [1] add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   221
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   222
  working directory is now at 6c144bb30333
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   223
  $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   224
  5 6c144bb30333 1969-12-31 23:59 -0000: 
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   225
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   226
date: updated one one side to an older value
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   227
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   228
  $ hg strip .
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   229
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   230
  saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/6c144bb30333-72e26b88-backup.hg
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   231
  2 new content-divergent changesets
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   232
  $ hg up tip
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   233
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   234
  $ hg amend --date "0 3"
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   235
  $ hg log -G
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   236
  @  changeset:   5:6189a9adfff0
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   237
  |  tag:         tip
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   238
  |  parent:      0:a24ed8ad918c
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   239
  |  user:        test
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   240
  |  date:        Wed Dec 31 23:59:57 1969 -0000
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   241
  |  instability: content-divergent
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   242
  |  summary:     add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   243
  |
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   244
  | *  changeset:   3:a25dd7af6cf6
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   245
  |/   parent:      0:a24ed8ad918c
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   246
  |    user:        test
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   247
  |    date:        Wed Dec 31 23:59:58 1969 -0000
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   248
  |    instability: content-divergent
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   249
  |    summary:     add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   250
  |
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   251
  o  changeset:   0:a24ed8ad918c
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   252
     user:        test
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   253
     date:        Thu Jan 01 00:00:00 1970 +0000
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   254
     summary:     add r0
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   255
  
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   256
  $ hg evolve --list -r .
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   257
  6189a9adfff0: add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   258
    content-divergent: a25dd7af6cf6 (draft) (precursor cc71ffbc7c00)
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   259
  
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   260
  $ hg log -r cc71ffbc7c00+6189a9adfff0+a25dd7af6cf6 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   261
  1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   262
  5 6189a9adfff0 1969-12-31 23:59 -0000: 
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   263
  3 a25dd7af6cf6 1969-12-31 23:59 -0000: 
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   264
  $ hg evolve --content-divergent
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   265
  merge:[3] add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   266
  with: [5] add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   267
  base: [1] add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   268
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   269
  working directory is now at 806d0024c04d
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   270
  $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   271
  6 806d0024c04d 1969-12-31 23:59 -0000: 
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   272
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   273
date: updated one side to an newer value
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   274
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   275
  $ hg strip .
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   276
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   277
  saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/806d0024c04d-24cb28ad-backup.hg
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   278
  2 new content-divergent changesets
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   279
  $ hg update a25dd7af6cf6 --hidden
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   280
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   281
  $ hg amend --date "120 0"
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   282
  $ hg log -G
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   283
  @  changeset:   6:5199d0bc13d4
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   284
  |  tag:         tip
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   285
  |  parent:      0:a24ed8ad918c
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   286
  |  user:        test
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   287
  |  date:        Thu Jan 01 00:02:00 1970 +0000
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   288
  |  instability: content-divergent
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   289
  |  summary:     add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   290
  |
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   291
  | *  changeset:   5:6189a9adfff0
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   292
  |/   parent:      0:a24ed8ad918c
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   293
  |    user:        test
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   294
  |    date:        Wed Dec 31 23:59:57 1969 -0000
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   295
  |    instability: content-divergent
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   296
  |    summary:     add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   297
  |
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   298
  o  changeset:   0:a24ed8ad918c
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   299
     user:        test
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   300
     date:        Thu Jan 01 00:00:00 1970 +0000
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   301
     summary:     add r0
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   302
  
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   303
  $ hg evolve --list -r .
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   304
  5199d0bc13d4: add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   305
    content-divergent: 6189a9adfff0 (draft) (precursor cc71ffbc7c00)
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   306
  
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   307
  $ hg up 6189a9adfff0
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   308
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   309
  $ hg log -r cc71ffbc7c00+6189a9adfff0+5199d0bc13d4 --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   310
  1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   311
  5 6189a9adfff0 1969-12-31 23:59 -0000: 
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   312
  6 5199d0bc13d4 1970-01-01 00:02 +0000: 
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   313
  $ hg evolve --content-divergent
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   314
  merge:[5] add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   315
  with: [6] add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   316
  base: [1] add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   317
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   318
  working directory is now at 51e08ac59670
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   319
  $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   320
  7 51e08ac59670 1970-01-01 00:02 +0000: 
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   321
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   322
date: updated each side to a different value, newer should win
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   323
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   324
  $ hg strip .
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   325
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   326
  saved backup bundle to $TESTTMP/divergingdate/.hg/strip-backup/51e08ac59670-d8a3c2ca-backup.hg
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   327
  2 new content-divergent changesets
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   328
  $ hg up tip
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   329
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   330
  $ hg amend --date "235 0"
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   331
  $ hg update 6189a9adfff0 --hidden
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   332
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   333
  $ hg amend --date "784 0"
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   334
  $ hg log -G
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   335
  @  changeset:   8:75254fb3164b
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   336
  |  tag:         tip
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   337
  |  parent:      0:a24ed8ad918c
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   338
  |  user:        test
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   339
  |  date:        Thu Jan 01 00:13:04 1970 +0000
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   340
  |  instability: content-divergent
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   341
  |  summary:     add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   342
  |
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   343
  | *  changeset:   7:5421a7efcc6e
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   344
  |/   parent:      0:a24ed8ad918c
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   345
  |    user:        test
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   346
  |    date:        Thu Jan 01 00:03:55 1970 +0000
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   347
  |    instability: content-divergent
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   348
  |    summary:     add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   349
  |
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   350
  o  changeset:   0:a24ed8ad918c
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   351
     user:        test
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   352
     date:        Thu Jan 01 00:00:00 1970 +0000
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   353
     summary:     add r0
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   354
  
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   355
  $ hg evolve --list -r .
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   356
  75254fb3164b: add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   357
    content-divergent: 5421a7efcc6e (draft) (precursor cc71ffbc7c00)
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   358
  
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   359
  $ hg log -r 6189a9adfff0+5421a7efcc6e+75254fb3164b --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   360
  5 6189a9adfff0 1969-12-31 23:59 -0000: date-changed using amend as 8:75254fb3164b
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   361
  7 5421a7efcc6e 1970-01-01 00:03 +0000: 
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   362
  8 75254fb3164b 1970-01-01 00:13 +0000: 
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   363
  $ hg evolve --content-divergent
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   364
  merge:[7] add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   365
  with: [8] add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   366
  base: [1] add foo.txt
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   367
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   368
  working directory is now at ab7c0a425dc9
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   369
  $ hg log -r . --hidden -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   370
  9 ab7c0a425dc9 1970-01-01 00:13 +0000: 
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   371
18fe83bf7b14 evolve: move a test where it makes more sense
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4636
diff changeset
   372
  $ cd ..