tests/test-evolve-phase-divergence.t
author Matt Harbison <matt_harbison@yahoo.com>
Sat, 10 Nov 2018 23:54:46 -0500
changeset 4254 8e891b4a54e8
parent 4181 ab3581bc0637
child 4202 f555039d1a08
child 4340 5300be965515
permissions -rw-r--r--
compat: drop Mercurial 4.3 support for exthelper The last release email noted plans to drop 4.3 and 4.4 support in the next feature release. I'd like to move this code into core, and dropping this should allow the class to be copied in unmodified.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3610
145dab8c60c9 tests: rename test-evolve-bumped to test-evolve-phase-divergence.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3155
diff changeset
     1
** Test for handling of phase divergent changesets by `hg evolve` **
145dab8c60c9 tests: rename test-evolve-bumped to test-evolve-phase-divergence.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3155
diff changeset
     2
====================================================================
145dab8c60c9 tests: rename test-evolve-bumped to test-evolve-phase-divergence.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3155
diff changeset
     3
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
     4
  $ cat >> $HGRCPATH <<EOF
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
     5
  > [alias]
3625
7e253bbac9a1 tests: show first line of commit message in test-evolve-phase-divergence.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3624
diff changeset
     6
  > glog = log -GT "{rev}:{node|short} {desc|firstline}\n ({bookmarks}) {phase}"
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
     7
  > [extensions]
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
     8
  > rebase =
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
     9
  > EOF
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    10
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    11
Setting up a public repo
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    12
------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    13
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    14
  $ hg init public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    15
  $ cd public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    16
  $ echo a > a
1417
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
    17
  $ mkcommit() {
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
    18
  >    echo "$1" > "$1"
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
    19
  >    hg add "$1"
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
    20
  >    hg ci -m "add $1"
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
    21
  > }
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    22
  $ hg commit -A -m init
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    23
  adding a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    24
  $ cd ..
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    25
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1453
diff changeset
    26
  $ evolvepath=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    27
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    28
Setting up a private non-publishing repo
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    29
----------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    30
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    31
  $ hg clone -U public private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    32
  $ cd private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    33
  $ cat >> .hg/hgrc <<EOF
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    34
  > [extensions]
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    35
  > evolve = $evolvepath
1416
b8a9d2e8c772 test-evolve-bumped: improve tests legibility
Laurent Charignon <lcharignon@fb.com>
parents: 1404
diff changeset
    36
  > [ui]
b8a9d2e8c772 test-evolve-bumped: improve tests legibility
Laurent Charignon <lcharignon@fb.com>
parents: 1404
diff changeset
    37
  > logtemplate = {rev}:{node|short}@{branch}({phase}) {desc|firstline}\n
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    38
  > [phases]
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    39
  > publish = false
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    40
  > EOF
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    41
  $ cd ..
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    42
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    43
Setting up couple of more instances of private repo
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    44
---------------------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    45
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    46
  $ cp -a private alice
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    47
  $ cp -a private bob
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    48
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    49
Creating a phase-divergence changeset
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    50
-------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    51
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    52
Alice creating a draft changeset and pushing to main private repo
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    53
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    54
  $ cd alice
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    55
  $ hg update
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    56
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    57
  $ echo a >> a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    58
  $ hg commit -u alice -m 'modify a'
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    59
  $ hg push ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    60
  pushing to ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    61
  searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    62
  adding changesets
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    63
  adding manifests
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    64
  adding file changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    65
  added 1 changesets with 1 changes to 1 files
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    66
  $ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    67
  @  1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    68
  |   () draft
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    69
  o  0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    70
      () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    71
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    72
Bob pulling from private repo and pushing to the main public repo making the
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    73
changeset public
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    74
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    75
  $ cd ../bob
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    76
  $ hg pull ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    77
  pulling from ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    78
  searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    79
  adding changesets
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    80
  adding manifests
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    81
  adding file changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    82
  added 1 changesets with 1 changes to 1 files
4181
ab3581bc0637 branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4165
diff changeset
    83
  new changesets 4d1169d82e47 (1 drafts)
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    84
  (run 'hg update' to get a working copy)
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    85
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    86
  $ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    87
  o  1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    88
  |   () draft
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    89
  o  0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    90
      () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    91
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    92
  $ hg push ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    93
  pushing to ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    94
  searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    95
  adding changesets
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    96
  adding manifests
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    97
  adding file changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    98
  added 1 changesets with 1 changes to 1 files
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    99
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   100
  $ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   101
  o  1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   102
  |   () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   103
  o  0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   104
      () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   105
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   106
*But* Alice decided to amend the changeset she had and then pulling from public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   107
repo creating phase-divergent changeset locally
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   108
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   109
  $ cd ../alice
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   110
  $ hg amend -m 'tweak a'
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   111
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   112
XXX: pull should tell us how to see what is the new phase-divergent changeset
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   113
  $ hg pull ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   114
  pulling from ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   115
  searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   116
  no changes found
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   117
  1 new phase-divergent changesets
3837
dda5b2134b32 tests: update tests output with changes in d0abd7949ea3 in core hg
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3786
diff changeset
   118
  1 local changesets published
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   119
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   120
  $ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   121
  @  2:98bb3a6cfe1a tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   122
  |   () draft
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   123
  | o  1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   124
  |/    () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   125
  o  0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   126
      () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   127
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   128
Using evolve --list to list phase-divergent changesets
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   129
------------------------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   130
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   131
  $ hg evolve --list
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   132
  98bb3a6cfe1a: tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   133
    phase-divergent: 4d1169d82e47 (immutable precursor)
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   134
  
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   135
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   136
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   137
XXX-Pulkit: Trying to see instability on public changeset
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   138
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   139
XXX-Pulkit: this is not helpful
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   140
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   141
XXX-Marmoute: public changeset "instable themself"
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   142
XXX-Marmoute: I'm not sure if we store this information and it is useful to show it.
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   143
XXX-Marmoute: We should maybe point the user toward `hg obslog` instead`
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   144
  $ hg evolve -r 4d1169d8 --list
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   145
  4d1169d82e47: modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   146
  
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   147
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   148
Understanding phasedivergence using obslog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   149
------------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   150
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   151
XXX: There must be mention of phase-divergence here
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   152
  $ hg obslog -r . --all
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   153
  @  98bb3a6cfe1a (2) tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   154
  |
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   155
  o  4d1169d82e47 (1) modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   156
       rewritten(description) as 98bb3a6cfe1a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   157
  
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   158
Solving the phase divergence using evolve command
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   159
--------------------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   160
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   161
(We do not solve evolution other than orphan by default because it turned out
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   162
it was too confusing for users. We used to behave this way, but having multiple
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   163
possible outcome to evolve end up scaring people)
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   164
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   165
  $ hg evolve
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   166
  nothing to evolve on current working copy parent
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   167
  (do you want to use --phase-divergent)
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   168
  [2]
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   169
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   170
testing the --confirm option
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   171
  $ hg evolve --phase-divergent --confirm <<EOF
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   172
  > n
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   173
  > EOF
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   174
  recreate:[2] tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   175
  atop:[1] modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   176
  perform evolve? [Ny] n
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   177
  abort: evolve aborted by user
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   178
  [255]
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   179
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   180
testing the --dry-run option
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   181
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   182
  $ hg evolve --phase-divergent --dry-run
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   183
  recreate:[2] tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   184
  atop:[1] modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   185
  hg rebase --rev 98bb3a6cfe1a --dest d3873e73d99e;
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   186
  hg update 4d1169d82e47;
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   187
  hg revert --all --rev 98bb3a6cfe1a;
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   188
  hg commit --msg "phase-divergent update to 98bb3a6cfe1a"
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   189
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   190
XXX: evolve should have mentioned that draft commit is just obsoleted in favour
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   191
of public one. From the message it looks like a new commit is created.
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   192
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   193
  $ hg evolve --phase-divergent
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   194
  recreate:[2] tweak a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   195
  atop:[1] modify a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   196
  computing new diff
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   197
  committed as 4d1169d82e47
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   198
  working directory is now at 4d1169d82e47
1417
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
   199
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   200
  $ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   201
  @  1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   202
  |   () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   203
  o  0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   204
      () public
3620
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   205
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   206
Syncying every repo with the new state
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   207
--------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   208
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   209
  $ hg push ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   210
  pushing to ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   211
  searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   212
  no changes found
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   213
  2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   214
  [1]
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   215
  $ hg push ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   216
  pushing to ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   217
  searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   218
  no changes found
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   219
  2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   220
  [1]
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   221
  $ hg push ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   222
  pushing to ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   223
  searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   224
  no changes found
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   225
  2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   226
  [1]
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   227
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   228
Creating more phase-divergence where a new resolution commit will be formed and
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   229
also testing bookmark movement
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   230
--------------------------------------------------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   231
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   232
Alice created a commit and push to private non-publishing repo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   233
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   234
  $ echo foo > foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   235
  $ hg add foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   236
  $ hg ci -m "added foo to foo"
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   237
  $ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   238
  @  3:aa071e5554e3 added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   239
  |   () draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   240
  o  1:4d1169d82e47 modify a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   241
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   242
  o  0:d3873e73d99e init
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   243
      () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   244
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   245
  $ hg push ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   246
  pushing to ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   247
  searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   248
  adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   249
  adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   250
  adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   251
  added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   252
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   253
Bob pulled from the private repo and pushed that to publishing repo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   254
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   255
  $ cd ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   256
  $ hg pull ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   257
  pulling from ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   258
  searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   259
  adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   260
  adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   261
  adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   262
  added 1 changesets with 1 changes to 1 files
4181
ab3581bc0637 branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4165
diff changeset
   263
  new changesets aa071e5554e3 (1 drafts)
3620
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   264
  (run 'hg update' to get a working copy)
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   265
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   266
  $ hg push ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   267
  pushing to ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   268
  searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   269
  adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   270
  adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   271
  adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   272
  added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   273
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   274
Alice amended that changeset and then pulled from publishing repo creating
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   275
phase-divergence
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   276
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   277
  $ cd ../alice
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   278
  $ echo bar >> foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   279
  $ hg amend -m "added bar to foo"
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   280
  $ hg bookmark bm
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   281
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   282
  $ hg pull ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   283
  pulling from ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   284
  searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   285
  no changes found
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   286
  1 new phase-divergent changesets
3837
dda5b2134b32 tests: update tests output with changes in d0abd7949ea3 in core hg
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3786
diff changeset
   287
  1 local changesets published
3620
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   288
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   289
  $ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   290
  @  4:d47f2b37ed82 added bar to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   291
  |   (bm) draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   292
  | o  3:aa071e5554e3 added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   293
  |/    () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   294
  o  1:4d1169d82e47 modify a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   295
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   296
  o  0:d3873e73d99e init
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   297
      () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   298
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   299
Resolving the new phase-divergence changeset using `hg evolve`
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   300
--------------------------------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   301
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   302
XXX: this should have popped up for a new commit message of the changeset or an
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   303
option should be there
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   304
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   305
XXX: we should document what should user expect where running this, writing this
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   306
test I have to go through code base to understand what will be the behavior
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   307
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   308
  $ hg evolve --phase-divergent
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   309
  recreate:[4] added bar to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   310
  atop:[3] added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   311
  computing new diff
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   312
  committed as 3d62500c673d
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   313
  working directory is now at 3d62500c673d
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   314
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   315
  $ hg exp
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   316
  # HG changeset patch
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   317
  # User test
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   318
  # Date 0 0
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   319
  #      Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   320
  # Node ID 3d62500c673dd1c88bb09a73e86d0210aed6fcb6
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   321
  # Parent  aa071e5554e36080a36cfd24accd5a71e3320f1e
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   322
  phase-divergent update to aa071e5554e3:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   323
  
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   324
  added bar to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   325
  
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   326
  diff -r aa071e5554e3 -r 3d62500c673d foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   327
  --- a/foo	Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   328
  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   329
  @@ -1,1 +1,2 @@
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   330
   foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   331
  +bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   332
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   333
XXX: the commit message is not best one, we should give option to user to modify
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   334
the commit message
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   335
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   336
  $ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   337
  @  5:3d62500c673d phase-divergent update to aa071e5554e3:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   338
  |   (bm) draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   339
  o  3:aa071e5554e3 added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   340
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   341
  o  1:4d1169d82e47 modify a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   342
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   343
  o  0:d3873e73d99e init
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   344
      () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   345
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   346
  $ hg obslog -r . --all
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   347
  @  3d62500c673d (5) phase-divergent update to aa071e5554e3:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   348
  |
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   349
  x  d47f2b37ed82 (4) added bar to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   350
  |    rewritten(description, parent, content) as 3d62500c673d using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   351
  |
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   352
  o  aa071e5554e3 (3) added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   353
       rewritten(description, content) as d47f2b37ed82 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   354
  
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   355
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   356
Syncing all other repositories
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   357
------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   358
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   359
These pushed should not be turned to quiet mode as the output is very helpful to
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   360
make sure everything is working fine
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   361
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   362
  $ hg push ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   363
  pushing to ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   364
  searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   365
  adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   366
  adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   367
  adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   368
  added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   369
  2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   370
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   371
  $ hg push ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   372
  pushing to ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   373
  searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   374
  adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   375
  adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   376
  adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   377
  added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   378
  2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   379
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   380
  $ hg push ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   381
  pushing to ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   382
  searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   383
  adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   384
  adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   385
  adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   386
  added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   387
  2 new obsolescence markers
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   388
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   389
Creating a phasedivergence changeset where the divergent changeset changed in a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   390
way that we rebase that on old public changeset, there will be conflicts, but
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   391
the `hg evolve` command handles it very well and uses `hg revert` logic to
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   392
prevent any conflicts
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   393
-------------------------------------------------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   394
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   395
Alice creates one more changeset and pushes to private repo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   396
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   397
  $ echo bar > bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   398
  $ hg ci -Aqm "added bar to bar"
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   399
  $ hg push ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   400
  pushing to ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   401
  searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   402
  adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   403
  adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   404
  adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   405
  added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   406
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   407
Bob pulls from private and pushes to public repo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   408
  $ cd ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   409
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   410
  $ hg pull ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   411
  pulling from ../private
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   412
  searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   413
  adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   414
  adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   415
  adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   416
  added 1 changesets with 1 changes to 1 files
4181
ab3581bc0637 branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4165
diff changeset
   417
  new changesets b756eb10ea73 (1 drafts)
3837
dda5b2134b32 tests: update tests output with changes in d0abd7949ea3 in core hg
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3786
diff changeset
   418
  1 local changesets published
3620
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   419
  (run 'hg update' to get a working copy)
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   420
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   421
  $ hg push ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   422
  pushing to ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   423
  searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   424
  adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   425
  adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   426
  adding file changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   427
  added 1 changesets with 1 changes to 1 files
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   428
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   429
Alice amends the changeset and then pull from public creating phase-divergence
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   430
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   431
  $ cd ../alice
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   432
  $ echo foo > bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   433
  $ hg amend -m "foo to bar"
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   434
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   435
  $ hg pull ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   436
  pulling from ../public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   437
  searching for changes
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   438
  no changes found
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   439
  1 new phase-divergent changesets
3837
dda5b2134b32 tests: update tests output with changes in d0abd7949ea3 in core hg
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3786
diff changeset
   440
  1 local changesets published
3620
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   441
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   442
  $ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   443
  @  7:2c3560aedead foo to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   444
  |   (bm) draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   445
  | o  6:b756eb10ea73 added bar to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   446
  |/    () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   447
  o  5:3d62500c673d phase-divergent update to aa071e5554e3:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   448
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   449
  o  3:aa071e5554e3 added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   450
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   451
  o  1:4d1169d82e47 modify a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   452
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   453
  o  0:d3873e73d99e init
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   454
      () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   455
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   456
Resolving the new phase-divergence changeset using `hg evolve`
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   457
---------------------------------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   458
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   459
  $ hg evolve --phase-divergent
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   460
  recreate:[7] foo to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   461
  atop:[6] added bar to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   462
  computing new diff
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   463
  committed as 502e73736632
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   464
  working directory is now at 502e73736632
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   465
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   466
  $ hg exp
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   467
  # HG changeset patch
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   468
  # User test
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   469
  # Date 0 0
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   470
  #      Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   471
  # Node ID 502e737366322886cf628276aa0a2796904453b4
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   472
  # Parent  b756eb10ea73ee4ba69c998e64a5c6e1005d74b5
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   473
  phase-divergent update to b756eb10ea73:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   474
  
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   475
  foo to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   476
  
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   477
  diff -r b756eb10ea73 -r 502e73736632 bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   478
  --- a/bar	Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   479
  +++ b/bar	Thu Jan 01 00:00:00 1970 +0000
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   480
  @@ -1,1 +1,1 @@
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   481
  -bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   482
  +foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   483
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   484
  $ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   485
  @  8:502e73736632 phase-divergent update to b756eb10ea73:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   486
  |   (bm) draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   487
  o  6:b756eb10ea73 added bar to bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   488
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   489
  o  5:3d62500c673d phase-divergent update to aa071e5554e3:
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   490
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   491
  o  3:aa071e5554e3 added foo to foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   492
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   493
  o  1:4d1169d82e47 modify a
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   494
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   495
  o  0:d3873e73d99e init
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   496
      () public
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   497
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   498
Syncing all the repositories
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   499
----------------------------
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   500
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   501
  $ hg push ../private
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   502
  pushing to ../private
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   503
  searching for changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   504
  adding changesets
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   505
  adding manifests
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   506
  adding file changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   507
  added 1 changesets with 1 changes to 1 files
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   508
  2 new obsolescence markers
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   509
  $ hg push ../public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   510
  pushing to ../public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   511
  searching for changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   512
  adding changesets
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   513
  adding manifests
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   514
  adding file changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   515
  added 1 changesets with 1 changes to 1 files
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   516
  2 new obsolescence markers
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   517
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   518
Creating phase-divergence with divergent changeset and precursor having
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   519
different parents
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   520
-----------------------------------------------------------------------
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   521
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   522
Alice creates a changeset and pushes to private repo
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   523
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   524
  $ echo x > x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   525
  $ hg ci -Am "added x to x"
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   526
  adding x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   527
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   528
  $ hg push ../private
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   529
  pushing to ../private
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   530
  searching for changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   531
  adding changesets
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   532
  adding manifests
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   533
  adding file changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   534
  added 1 changesets with 1 changes to 1 files
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   535
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   536
Bob does what he always does, pull from private and push to public, he is acting
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   537
as a CI service
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   538
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   539
  $ cd ../bob
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   540
  $ hg pull ../private
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   541
  pulling from ../private
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   542
  searching for changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   543
  adding changesets
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   544
  adding manifests
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   545
  adding file changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   546
  added 2 changesets with 2 changes to 2 files
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   547
  2 new obsolescence markers
4181
ab3581bc0637 branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4165
diff changeset
   548
  new changesets 502e73736632:2352021b3785 (1 drafts)
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   549
  (run 'hg update' to get a working copy)
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   550
  $ hg push ../public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   551
  pushing to ../public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   552
  searching for changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   553
  adding changesets
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   554
  adding manifests
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   555
  adding file changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   556
  added 1 changesets with 1 changes to 1 files
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   557
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   558
Alice like always dont care about Bob existence and rebases her changeset and
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   559
then pull from public repo creating phase divergence
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   560
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   561
  $ cd ../alice
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   562
  $ hg rebase -r . -d .^^^
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   563
  rebasing 9:2352021b3785 "added x to x" (bm tip)
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   564
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   565
  $ hg pull ../public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   566
  pulling from ../public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   567
  searching for changes
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   568
  no changes found
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   569
  1 new phase-divergent changesets
3837
dda5b2134b32 tests: update tests output with changes in d0abd7949ea3 in core hg
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3786
diff changeset
   570
  1 local changesets published
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   571
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   572
  $ hg obslog -r .
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   573
  @  334e300d6db5 (10) added x to x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   574
  |
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   575
  o  2352021b3785 (9) added x to x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   576
       rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   577
  
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   578
  $ hg glog -r .^::
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   579
  @  10:334e300d6db5 added x to x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   580
  |   (bm) draft
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   581
  | o  9:2352021b3785 added x to x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   582
  | |   () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   583
  | o  8:502e73736632 phase-divergent update to b756eb10ea73:
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   584
  | |   () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   585
  | o  6:b756eb10ea73 added bar to bar
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   586
  |/    () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   587
  o  5:3d62500c673d phase-divergent update to aa071e5554e3:
3625
7e253bbac9a1 tests: show first line of commit message in test-evolve-phase-divergence.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3624
diff changeset
   588
  |   () public
7e253bbac9a1 tests: show first line of commit message in test-evolve-phase-divergence.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3624
diff changeset
   589
  ~
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   590
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   591
Using `hg evolve` to resolve phase-divergence
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   592
---------------------------------------------
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   593
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   594
  $ hg evolve --phase-divergent
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   595
  recreate:[10] added x to x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   596
  atop:[9] added x to x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   597
  rebasing to destination parent: 502e73736632
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   598
  (leaving bookmark bm)
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   599
  computing new diff
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   600
  committed as 2352021b3785
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   601
  working directory is now at 2352021b3785
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   602
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   603
XXX: we should move bookmark here
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   604
  $ hg glog
3624
6756f2a85f5b evolve: make sure bookmarks are moved after phase-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3623
diff changeset
   605
  @  9:2352021b3785 added x to x
6756f2a85f5b evolve: make sure bookmarks are moved after phase-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3623
diff changeset
   606
  |   (bm) public
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   607
  o  8:502e73736632 phase-divergent update to b756eb10ea73:
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   608
  |   () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   609
  o  6:b756eb10ea73 added bar to bar
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   610
  |   () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   611
  o  5:3d62500c673d phase-divergent update to aa071e5554e3:
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   612
  |   () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   613
  o  3:aa071e5554e3 added foo to foo
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   614
  |   () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   615
  o  1:4d1169d82e47 modify a
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   616
  |   () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   617
  o  0:d3873e73d99e init
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   618
      () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   619
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   620
  $ hg obslog -r . b1a0e143e32b --all --hidden
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   621
  x  b1a0e143e32b (11) added x to x
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   622
  |    pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   623
  |
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   624
  x  334e300d6db5 (10) added x to x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   625
  |    rewritten(parent) as b1a0e143e32b using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   626
  |
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   627
  @  2352021b3785 (9) added x to x
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   628
       rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   629
  
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   630
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   631
  $ hg exp
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   632
  # HG changeset patch
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   633
  # User test
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   634
  # Date 0 0
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   635
  #      Thu Jan 01 00:00:00 1970 +0000
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   636
  # Node ID 2352021b37851be226ebed109b0eb6eada918566
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   637
  # Parent  502e737366322886cf628276aa0a2796904453b4
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   638
  added x to x
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   639
  
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   640
  diff -r 502e73736632 -r 2352021b3785 x
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   641
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   642
  +++ b/x	Thu Jan 01 00:00:00 1970 +0000
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   643
  @@ -0,0 +1,1 @@
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   644
  +x
3626
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   645
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   646
Creating divergence with parent and content change both but not resulting in
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   647
conflicts
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   648
-----------------------------------------------------------------------------
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   649
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   650
Alice is tired of pushing and pulling and will create phase-divergence locally
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   651
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   652
  $ hg glog
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   653
  @  9:2352021b3785 added x to x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   654
  |   (bm) public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   655
  o  8:502e73736632 phase-divergent update to b756eb10ea73:
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   656
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   657
  o  6:b756eb10ea73 added bar to bar
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   658
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   659
  o  5:3d62500c673d phase-divergent update to aa071e5554e3:
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   660
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   661
  o  3:aa071e5554e3 added foo to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   662
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   663
  o  1:4d1169d82e47 modify a
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   664
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   665
  o  0:d3873e73d99e init
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   666
      () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   667
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   668
  $ echo y > y
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   669
  $ echo foobar >> foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   670
  $ hg add y
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   671
  $ hg ci -m "y to y and foobar to foo"
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   672
  $ hg rebase -r . -d .^^^
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   673
  rebasing 12:dc88f5aa9bc9 "y to y and foobar to foo" (tip)
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   674
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   675
  $ echo foo > y
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   676
  $ hg amend
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   677
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   678
Alice making the old changeset public to have content-divergence
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   679
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   680
  $ hg phase -r dc88f5aa9bc9 --public --hidden
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   681
  1 new phase-divergent changesets
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   682
  $ hg glog
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   683
  @  14:13015a180eee y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   684
  |   () draft
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   685
  | o  12:dc88f5aa9bc9 y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   686
  | |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   687
  | o  9:2352021b3785 added x to x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   688
  | |   (bm) public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   689
  | o  8:502e73736632 phase-divergent update to b756eb10ea73:
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   690
  |/    () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   691
  o  6:b756eb10ea73 added bar to bar
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   692
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   693
  o  5:3d62500c673d phase-divergent update to aa071e5554e3:
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   694
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   695
  o  3:aa071e5554e3 added foo to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   696
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   697
  o  1:4d1169d82e47 modify a
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   698
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   699
  o  0:d3873e73d99e init
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   700
      () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   701
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   702
  $ hg obslog -r .
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   703
  @  13015a180eee (14) y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   704
  |
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   705
  x  211ab84d1689 (13) y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   706
  |    rewritten(content) as 13015a180eee using amend by test (Thu Jan 01 00:00:00 1970 +0000)
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   707
  |
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   708
  o  dc88f5aa9bc9 (12) y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   709
       rewritten(parent) as 211ab84d1689 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   710
  
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   711
Resolving divergence using `hg evolve`
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   712
-------------------------------------
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   713
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   714
  $ hg evolve --phase-divergent
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   715
  recreate:[14] y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   716
  atop:[12] y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   717
  rebasing to destination parent: 2352021b3785
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   718
  computing new diff
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   719
  committed as 8c2bb6fb44e9
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   720
  working directory is now at 8c2bb6fb44e9
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   721
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   722
  $ hg exp
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   723
  # HG changeset patch
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   724
  # User test
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   725
  # Date 0 0
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   726
  #      Thu Jan 01 00:00:00 1970 +0000
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   727
  # Node ID 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   728
  # Parent  dc88f5aa9bc90a6418899d267d9524205dfb429b
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   729
  phase-divergent update to dc88f5aa9bc9:
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   730
  
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   731
  y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   732
  
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   733
  diff -r dc88f5aa9bc9 -r 8c2bb6fb44e9 y
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   734
  --- a/y	Thu Jan 01 00:00:00 1970 +0000
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   735
  +++ b/y	Thu Jan 01 00:00:00 1970 +0000
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   736
  @@ -1,1 +1,1 @@
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   737
  -y
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   738
  +foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   739
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   740
  $ hg glog
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   741
  @  16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   742
  |   () draft
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   743
  o  12:dc88f5aa9bc9 y to y and foobar to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   744
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   745
  o  9:2352021b3785 added x to x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   746
  |   (bm) public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   747
  o  8:502e73736632 phase-divergent update to b756eb10ea73:
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   748
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   749
  o  6:b756eb10ea73 added bar to bar
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   750
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   751
  o  5:3d62500c673d phase-divergent update to aa071e5554e3:
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   752
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   753
  o  3:aa071e5554e3 added foo to foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   754
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   755
  o  1:4d1169d82e47 modify a
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   756
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   757
  o  0:d3873e73d99e init
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   758
      () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   759
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   760
Creating divergence with parent and content change both which results in
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   761
conflicts while rebasing on parent
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   762
-----------------------------------------------------------------------------
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   763
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   764
  $ echo l > l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   765
  $ hg ci -Aqm "added l to l"
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   766
  $ hg rebase -r . -d .^^^^
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   767
  rebasing 17:f3794e5a91dc "added l to l" (tip)
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   768
  $ echo kl > l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   769
  $ echo foo > x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   770
  $ hg add x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   771
  $ hg amend
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   772
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   773
  $ hg obslog -r .
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   774
  @  5fd38c0de46e (19) added l to l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   775
  |
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   776
  x  2bfd56949cf0 (18) added l to l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   777
  |    rewritten(content) as 5fd38c0de46e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   778
  |
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   779
  x  f3794e5a91dc (17) added l to l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   780
       rewritten(parent) as 2bfd56949cf0 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   781
  
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   782
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   783
  $ hg phase -r f3794e5a91dc --public --hidden
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   784
  1 new phase-divergent changesets
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   785
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   786
Resolution using `hg evolve --phase-divergent`
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   787
----------------------------------------------
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   788
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   789
  $ hg evolve --phase-divergent
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   790
  recreate:[19] added l to l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   791
  atop:[17] added l to l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   792
  rebasing to destination parent: 8c2bb6fb44e9
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   793
  merging x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   794
  warning: conflicts while merging x! (edit, then use 'hg resolve --mark')
3852
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3843
diff changeset
   795
  fix conflicts and see `hg help evolve.interrupted`
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3843
diff changeset
   796
  [1]
3626
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   797
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   798
  $ hg diff
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   799
  diff -r 8c2bb6fb44e9 l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   800
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   801
  +++ b/l	Thu Jan 01 00:00:00 1970 +0000
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   802
  @@ -0,0 +1,1 @@
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   803
  +kl
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   804
  diff -r 8c2bb6fb44e9 x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   805
  --- a/x	Thu Jan 01 00:00:00 1970 +0000
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   806
  +++ b/x	Thu Jan 01 00:00:00 1970 +0000
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   807
  @@ -1,1 +1,5 @@
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   808
  +<<<<<<< destination: 8c2bb6fb44e9 - test: phase-divergent update to dc88f5aa9...
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   809
   x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   810
  +=======
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   811
  +foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   812
  +>>>>>>> evolving:    5fd38c0de46e - test: added l to l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   813
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   814
  $ echo foo > x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   815
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   816
  $ hg resolve -m
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   817
  (no more unresolved files)
3628
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   818
  continue: hg evolve --continue
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   819
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   820
  $ hg evolve --continue
3633
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   821
  evolving 19:5fd38c0de46e "added l to l"
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   822
  computing new diff
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   823
  committed as e3090241a10c
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   824
  working directory is now at e3090241a10c
3626
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   825
3628
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   826
  $ hg glog
3633
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   827
  @  21:e3090241a10c phase-divergent update to f3794e5a91dc:
3628
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   828
  |   () draft
3633
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   829
  o  17:f3794e5a91dc added l to l
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   830
  |   () public
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   831
  o  16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   832
  |   () public
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   833
  o  12:dc88f5aa9bc9 y to y and foobar to foo
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   834
  |   () public
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   835
  o  9:2352021b3785 added x to x
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   836
  |   (bm) public
3628
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   837
  o  8:502e73736632 phase-divergent update to b756eb10ea73:
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   838
  |   () public
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   839
  o  6:b756eb10ea73 added bar to bar
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   840
  |   () public
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   841
  o  5:3d62500c673d phase-divergent update to aa071e5554e3:
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   842
  |   () public
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   843
  o  3:aa071e5554e3 added foo to foo
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   844
  |   () public
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   845
  o  1:4d1169d82e47 modify a
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   846
  |   () public
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   847
  o  0:d3873e73d99e init
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   848
      () public
3633
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   849
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   850
  $ hg exp
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   851
  # HG changeset patch
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   852
  # User test
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   853
  # Date 0 0
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   854
  #      Thu Jan 01 00:00:00 1970 +0000
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   855
  # Node ID e3090241a10c320b6132e4673915fd6b19c0de39
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   856
  # Parent  f3794e5a91dc1d4d36fee5c423386b19433a1f48
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   857
  phase-divergent update to f3794e5a91dc:
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   858
  
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   859
  added l to l
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   860
  
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   861
  diff -r f3794e5a91dc -r e3090241a10c l
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   862
  --- a/l	Thu Jan 01 00:00:00 1970 +0000
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   863
  +++ b/l	Thu Jan 01 00:00:00 1970 +0000
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   864
  @@ -1,1 +1,1 @@
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   865
  -l
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   866
  +kl
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   867
  diff -r f3794e5a91dc -r e3090241a10c x
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   868
  --- a/x	Thu Jan 01 00:00:00 1970 +0000
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   869
  +++ b/x	Thu Jan 01 00:00:00 1970 +0000
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   870
  @@ -1,1 +1,1 @@
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   871
  -x
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   872
  +foo
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   873
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   874
Creating phase divergence when couple of changesets are folded into one
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   875
------------------------------------------------------------------------
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   876
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   877
  $ hg glog -r .
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   878
  @  21:e3090241a10c phase-divergent update to f3794e5a91dc:
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   879
  |   () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   880
  ~
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   881
  $ echo f > f
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   882
  $ hg ci -Aqm "added f"
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   883
  $ echo g > g
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   884
  $ hg ci -Aqm "added g"
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   885
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   886
  $ hg fold -r . -r .^ --exact
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   887
  2 changesets folded
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   888
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   889
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   890
  $ hg evolve --list
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   891
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   892
  $ hg phase -r 428f7900a969 --public --hidden
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   893
  1 new phase-divergent changesets
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   894
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   895
  $ hg glog -r f3794e5a91dc::
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   896
  @  24:e450d05b7d27 added g
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   897
  |   () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   898
  | o  23:428f7900a969 added g
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   899
  | |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   900
  | o  22:21ae52e414e6 added f
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   901
  |/    () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   902
  o  21:e3090241a10c phase-divergent update to f3794e5a91dc:
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   903
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   904
  o  17:f3794e5a91dc added l to l
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   905
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   906
  ~
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   907
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   908
  $ hg evolve --list
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   909
  e450d05b7d27: added g
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   910
    phase-divergent: 21ae52e414e6 (immutable precursor)
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   911
    phase-divergent: 428f7900a969 (immutable precursor)
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   912
  
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   913
Resolving phase divergence using `hg evolve`
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   914
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   915
  $ hg evolve --phase-divergent --all
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   916
  recreate:[24] added g
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   917
  atop:[23] added g
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   918
  rebasing to destination parent: 21ae52e414e6
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   919
  computing new diff
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   920
  committed as 428f7900a969
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   921
  working directory is now at 428f7900a969
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   922
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   923
  $ hg glog -r f3794e5a91dc::
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   924
  @  23:428f7900a969 added g
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   925
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   926
  o  22:21ae52e414e6 added f
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   927
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   928
  o  21:e3090241a10c phase-divergent update to f3794e5a91dc:
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   929
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   930
  o  17:f3794e5a91dc added l to l
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   931
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   932
  ~
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   933
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   934
When the public changesets is splitted causing phase-divergence
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   935
---------------------------------------------------------------
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   936
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   937
  $ echo m > m
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   938
  $ echo n > n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   939
  $ hg ci -Aqm "added m and n"
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   940
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   941
  $ hg glog -r 21ae52e414e6::
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   942
  @  26:849cee0a874b added m and n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   943
  |   () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   944
  o  23:428f7900a969 added g
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   945
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   946
  o  22:21ae52e414e6 added f
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   947
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   948
  ~
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   949
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   950
  $ hg prev
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   951
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   952
  [23] added g
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   953
  $ echo m > m
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   954
  $ hg ci -Aqm "added m"
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   955
  $ echo n > n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   956
  $ hg ci -Aqm "added n"
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   957
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   958
  $ hg glog -r 428f7900a969::
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   959
  @  28:63ccb8ea7cae added n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   960
  |   () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   961
  o  27:f313e2b90e70 added m
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   962
  |   () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   963
  | o  26:849cee0a874b added m and n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   964
  |/    () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   965
  o  23:428f7900a969 added g
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   966
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   967
  ~
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   968
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   969
  $ hg prune -r 849cee0a874b --succ f313e2b90e70 --succ 63ccb8ea7cae --split
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   970
  1 changesets pruned
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   971
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   972
  $ hg phase -r 849cee0a874b --hidden --public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   973
  2 new phase-divergent changesets
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   974
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   975
  $ hg glog -r 428f7900a969::
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   976
  @  28:63ccb8ea7cae added n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   977
  |   () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   978
  *  27:f313e2b90e70 added m
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   979
  |   () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   980
  | o  26:849cee0a874b added m and n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   981
  |/    () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   982
  o  23:428f7900a969 added g
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   983
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   984
  ~
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   985
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   986
  $ hg evolve --all --phase-divergent
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   987
  recreate:[27] added m
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   988
  atop:[26] added m and n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   989
  computing new diff
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   990
  committed as 870e1c3eddc3
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   991
  1 new orphan changesets
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   992
  recreate:[28] added n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   993
  atop:[26] added m and n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   994
  rebasing to destination parent: 428f7900a969
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   995
  computing new diff
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   996
  committed as 154b0179fb9b
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   997
  working directory is now at 154b0179fb9b
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   998
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   999
XXX: this is messy, we should solve things in better way
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1000
  $ hg glog -r 428f7900a969:: --hidden
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1001
  @  31:154b0179fb9b phase-divergent update to 849cee0a874b:
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1002
  |   () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1003
  | x  30:1ebf33547a82 added n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1004
  | |   () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1005
  +---o  29:870e1c3eddc3 phase-divergent update to 849cee0a874b:
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1006
  | |     () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1007
  | | x  28:63ccb8ea7cae added n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1008
  | | |   () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1009
  | | x  27:f313e2b90e70 added m
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1010
  | |/    () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1011
  o |  26:849cee0a874b added m and n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1012
  |/    () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1013
  o  23:428f7900a969 added g
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1014
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1015
  ~
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1016
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1017
XXX: not sure this is the correct
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1018
  $ hg exp 154b0179fb9b
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1019
  # HG changeset patch
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1020
  # User test
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1021
  # Date 0 0
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1022
  #      Thu Jan 01 00:00:00 1970 +0000
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1023
  # Node ID 154b0179fb9b53d2f853d6ba04740bb3d7a5cabe
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1024
  # Parent  849cee0a874be7c4e75dfacb5ad72aa5696951ba
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1025
  phase-divergent update to 849cee0a874b:
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1026
  
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1027
  added n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1028
  
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1029
  diff -r 849cee0a874b -r 154b0179fb9b m
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1030
  --- a/m	Thu Jan 01 00:00:00 1970 +0000
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1031
  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1032
  @@ -1,1 +0,0 @@
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1033
  -m
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1034
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1035
XXX: not sure this is correct
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1036
  $ hg exp 870e1c3eddc3
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1037
  # HG changeset patch
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1038
  # User test
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1039
  # Date 0 0
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1040
  #      Thu Jan 01 00:00:00 1970 +0000
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1041
  # Node ID 870e1c3eddc34cc475e8e13d2fe1934210c1937e
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1042
  # Parent  849cee0a874be7c4e75dfacb5ad72aa5696951ba
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1043
  phase-divergent update to 849cee0a874b:
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1044
  
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1045
  added m
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1046
  
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1047
  diff -r 849cee0a874b -r 870e1c3eddc3 n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1048
  --- a/n	Thu Jan 01 00:00:00 1970 +0000
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1049
  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1050
  @@ -1,1 +0,0 @@
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1051
  -n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1052
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1053
When the public changeset is splitted across various branches
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1054
--------------------------------------------------------------
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1055
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1056
  $ echo p > p
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1057
  $ echo q > q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1058
  $ hg ci -Aqm "added p and q"
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1059
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1060
  $ hg prev
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1061
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1062
  [31] phase-divergent update to 849cee0a874b:
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1063
  $ echo p > p
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1064
  $ hg ci -Aqm "added p"
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1065
  $ hg prev
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1066
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1067
  [31] phase-divergent update to 849cee0a874b:
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1068
  $ echo q > q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1069
  $ hg ci -Aqm "added q"
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1070
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1071
  $ hg glog -r 154b0179fb9b::
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1072
  @  34:e046341aa97c added q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1073
  |   () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1074
  | o  33:6f8c250eecff added p
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1075
  |/    () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1076
  | o  32:8a70f55b2af3 added p and q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1077
  |/    () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1078
  o  31:154b0179fb9b phase-divergent update to 849cee0a874b:
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1079
  |   () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1080
  ~
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1081
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1082
  $ hg prune -r 8a70f55b2af3 --succ 6f8c250eecff --succ e046341aa97c --split
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1083
  1 changesets pruned
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1084
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1085
  $ hg phase -r 8a70f55b2af3 --public --hidden
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1086
  2 new phase-divergent changesets
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1087
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1088
  $ hg glog -r 154b0179fb9b::
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1089
  @  34:e046341aa97c added q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1090
  |   () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1091
  | *  33:6f8c250eecff added p
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1092
  |/    () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1093
  | o  32:8a70f55b2af3 added p and q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1094
  |/    () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1095
  o  31:154b0179fb9b phase-divergent update to 849cee0a874b:
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1096
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1097
  ~
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1098
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1099
  $ hg evolve --list
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1100
  6f8c250eecff: added p
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1101
    phase-divergent: 8a70f55b2af3 (immutable precursor)
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1102
  
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1103
  e046341aa97c: added q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1104
    phase-divergent: 8a70f55b2af3 (immutable precursor)
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1105
  
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1106
  $ hg evolve --all --phase-divergent
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1107
  recreate:[33] added p
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1108
  atop:[32] added p and q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1109
  computing new diff
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1110
  committed as f3e41d89b3c5
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1111
  recreate:[34] added q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1112
  atop:[32] added p and q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1113
  computing new diff
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1114
  committed as 605c306d4f87
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1115
  working directory is now at 605c306d4f87
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1116
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1117
  $ hg glog -r 154b0179fb9b:: --hidden
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1118
  @  36:605c306d4f87 phase-divergent update to 8a70f55b2af3:
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1119
  |   () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1120
  | o  35:f3e41d89b3c5 phase-divergent update to 8a70f55b2af3:
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1121
  |/    () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1122
  | x  34:e046341aa97c added q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1123
  | |   () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1124
  | | x  33:6f8c250eecff added p
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1125
  | |/    () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1126
  o |  32:8a70f55b2af3 added p and q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1127
  |/    () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1128
  o  31:154b0179fb9b phase-divergent update to 849cee0a874b:
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1129
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1130
  ~
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1131
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1132
XXX: not sure this is correct
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1133
  $ hg exp 605c306d4f87
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1134
  # HG changeset patch
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1135
  # User test
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1136
  # Date 0 0
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1137
  #      Thu Jan 01 00:00:00 1970 +0000
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1138
  # Node ID 605c306d4f87fccfdb5e7dd1c750b6d4f813defb
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1139
  # Parent  8a70f55b2af35452916dc89401a5ecf6553646a5
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1140
  phase-divergent update to 8a70f55b2af3:
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1141
  
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1142
  added q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1143
  
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1144
  diff -r 8a70f55b2af3 -r 605c306d4f87 p
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1145
  --- a/p	Thu Jan 01 00:00:00 1970 +0000
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1146
  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1147
  @@ -1,1 +0,0 @@
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1148
  -p
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1149
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1150
XXX: not sure this is correct
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1151
  $ hg exp f3e41d89b3c5
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1152
  # HG changeset patch
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1153
  # User test
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1154
  # Date 0 0
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1155
  #      Thu Jan 01 00:00:00 1970 +0000
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1156
  # Node ID f3e41d89b3c5f6ee49ccc734045856d7b025f048
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1157
  # Parent  8a70f55b2af35452916dc89401a5ecf6553646a5
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1158
  phase-divergent update to 8a70f55b2af3:
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1159
  
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1160
  added p
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1161
  
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1162
  diff -r 8a70f55b2af3 -r f3e41d89b3c5 q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1163
  --- a/q	Thu Jan 01 00:00:00 1970 +0000
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1164
  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1165
  @@ -1,1 +0,0 @@
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1166
  -q
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1167
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1168
Testing the evolution of a phase-divergent merge with no conflicts
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1169
------------------------------------------------------------------
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1170
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1171
  $ hg glog -r 154b0179fb9b::
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1172
  @  36:605c306d4f87 phase-divergent update to 8a70f55b2af3:
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1173
  |   () draft
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1174
  | o  35:f3e41d89b3c5 phase-divergent update to 8a70f55b2af3:
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1175
  |/    () draft
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1176
  o  32:8a70f55b2af3 added p and q
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1177
  |   () public
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1178
  o  31:154b0179fb9b phase-divergent update to 849cee0a874b:
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1179
  |   () public
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1180
  ~
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1181
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1182
  $ echo h > h
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1183
  $ hg ci -Aqm "added h"
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1184
  $ hg prev
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1185
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1186
  [36] phase-divergent update to 8a70f55b2af3:
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1187
  $ echo i > i
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1188
  $ hg ci -Aqm "added i"
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1189
  $ hg merge -r ef8c23f37b55
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1190
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1191
  (branch merge, don't forget to commit)
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1192
  $ hg ci -m "merge h and i"
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1193
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1194
  $ hg glog -r 605c306d4f87::
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1195
  @    39:12ebe0d625d7 merge h and i
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1196
  |\    () draft
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1197
  | o  38:9bb561db4230 added i
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1198
  | |   () draft
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1199
  o |  37:ef8c23f37b55 added h
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1200
  |/    () draft
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1201
  o  36:605c306d4f87 phase-divergent update to 8a70f55b2af3:
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1202
  |   () draft
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1203
  ~
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1204
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1205
  $ hg up ef8c23f37b55
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1206
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1207
  $ hg merge -r 9bb561db4230
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1208
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1209
  (branch merge, don't forget to commit)
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1210
  $ hg ci -m "merge h and i successor"
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1211
  created new head
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1212
  $ hg glog -r 605c306d4f87::
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1213
  @    40:d2aeda868461 merge h and i successor
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1214
  |\    () draft
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1215
  +---o  39:12ebe0d625d7 merge h and i
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1216
  | |/    () draft
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1217
  | o  38:9bb561db4230 added i
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1218
  | |   () draft
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1219
  o |  37:ef8c23f37b55 added h
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1220
  |/    () draft
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1221
  o  36:605c306d4f87 phase-divergent update to 8a70f55b2af3:
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1222
  |   () draft
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1223
  ~
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1224
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1225
  $ hg prune -r 12ebe0d625d7 --succ .
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1226
  1 changesets pruned
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1227
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1228
  $ hg phase 12ebe0d625d7 --hidden --public
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1229
  1 new phase-divergent changesets
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1230
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1231
Resolution of phase-divergent merge commit using `hg evolve`
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1232
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1233
XXX: we should handle phase-divergent merges
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1234
  $ hg evolve --phase-divergent
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1235
  skipping d2aeda868461 : we do not handle merge yet