tests/test-evolve-phase-divergence.t
author Martin von Zweigbergk <martinvonz@google.com>
Mon, 11 Mar 2019 23:57:12 -0700
changeset 4500 cfcb7eedc666
parent 4498 99dbe605fda5
child 4512 7a779a288793
child 4576 96ce1030d2fb
permissions -rw-r--r--
evolve: use merge.update() for resolving phase divergence Iterating over the manifest when tree manifests and narrowness is in play produces entries for paths outside the narrowspec that represent trees. For example, if the tests/ directory of the hg repo was not in the narrowspec (and the hg repo was using tree manifests, which it doesn't), then there would be a "tests/" entry in the manifest. The merge code deals with some of these cases. For example, it's valid to do a merge if only the local side changes directories outside the narrowspec. That allows rebasing a local commit onto a public commit that had changes to the excluded paths to work. However, _resolvephasedivergent() was iterating of the manifests, which resulted in crashes for some of our users when they tried to resolve phase-divergent commits (actually content-divergent commits that became phase-divergent after the intermediate rebase). We can fix that by relying on merge.update(), since that already handles this case.
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
4479
2db0aca03a88 extensions: avoid enabling evolve for unrelated repositories (issue6057)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4340
diff changeset
     4
  $ . $TESTDIR/testlib/common.sh
2db0aca03a88 extensions: avoid enabling evolve for unrelated repositories (issue6057)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4340
diff changeset
     5
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
     6
  $ cat >> $HGRCPATH <<EOF
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
     7
  > [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
     8
  > 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
     9
  > [extensions]
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
    10
  > rebase =
4479
2db0aca03a88 extensions: avoid enabling evolve for unrelated repositories (issue6057)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4340
diff changeset
    11
  > [extensions]
2db0aca03a88 extensions: avoid enabling evolve for unrelated repositories (issue6057)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4340
diff changeset
    12
  > evolve =
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    13
  > EOF
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    14
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    15
Setting up a public repo
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    16
------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    17
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    18
  $ hg init public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    19
  $ cd public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    20
  $ echo a > a
1417
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
    21
  $ mkcommit() {
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
    22
  >    echo "$1" > "$1"
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
    23
  >    hg add "$1"
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
    24
  >    hg ci -m "add $1"
9e7da169f66e test-evolve-bumped: add new test case for merge
Laurent Charignon <lcharignon@fb.com>
parents: 1416
diff changeset
    25
  > }
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    26
  $ 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
    27
  adding a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    28
  $ cd ..
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    29
1806
9f42f819267b evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 1453
diff changeset
    30
  $ 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
    31
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    32
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
    33
----------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    34
4448
ab5bc57ba897 tests: create "private" repository in already-updated state
Martin von Zweigbergk <martinvonz@google.com>
parents: 4340
diff changeset
    35
  $ hg clone public private
ab5bc57ba897 tests: create "private" repository in already-updated state
Martin von Zweigbergk <martinvonz@google.com>
parents: 4340
diff changeset
    36
  updating to branch default
ab5bc57ba897 tests: create "private" repository in already-updated state
Martin von Zweigbergk <martinvonz@google.com>
parents: 4340
diff changeset
    37
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    38
  $ cd private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    39
  $ cat >> .hg/hgrc <<EOF
1416
b8a9d2e8c772 test-evolve-bumped: improve tests legibility
Laurent Charignon <lcharignon@fb.com>
parents: 1404
diff changeset
    40
  > [ui]
b8a9d2e8c772 test-evolve-bumped: improve tests legibility
Laurent Charignon <lcharignon@fb.com>
parents: 1404
diff changeset
    41
  > 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
    42
  > [phases]
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    43
  > publish = false
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    44
  > EOF
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    45
  $ cd ..
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    46
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    47
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
    48
---------------------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    49
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    50
  $ 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
    51
  $ cp -a private bob
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
    52
  $ cp -a private split
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
    53
  $ cp -a private split-across-branches
4456
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
    54
  $ cp -a private split-and-amend
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
    55
  $ cp -a private merge-no-conflict
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    56
4495
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
    57
Simple phase-divergence case
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
    58
============================
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
    59
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    60
Creating a phase-divergence changeset
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    61
-------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    62
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    63
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
    64
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    65
  $ cd alice
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    66
  $ echo a >> a
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    67
  $ 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
    68
  $ hg push ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    69
  pushing to ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    70
  searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    71
  adding changesets
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    72
  adding manifests
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    73
  adding file changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    74
  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
    75
  $ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    76
  @  1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    77
  |   () draft
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    78
  o  0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    79
      () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    80
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    81
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
    82
changeset public
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    83
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    84
  $ cd ../bob
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    85
  $ hg pull ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    86
  pulling from ../private
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    87
  searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    88
  adding changesets
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    89
  adding manifests
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    90
  adding file changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    91
  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
    92
  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
    93
  (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
    94
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    95
  $ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    96
  o  1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    97
  |   () draft
4448
ab5bc57ba897 tests: create "private" repository in already-updated state
Martin von Zweigbergk <martinvonz@google.com>
parents: 4340
diff changeset
    98
  @  0:d3873e73d99e init
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
    99
      () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   100
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   101
  $ hg push ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   102
  pushing to ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   103
  searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   104
  adding changesets
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   105
  adding manifests
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   106
  adding file changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   107
  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
   108
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   109
  $ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   110
  o  1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   111
  |   () public
4448
ab5bc57ba897 tests: create "private" repository in already-updated state
Martin von Zweigbergk <martinvonz@google.com>
parents: 4340
diff changeset
   112
  @  0:d3873e73d99e init
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   113
      () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   114
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   115
*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
   116
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
   117
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   118
  $ cd ../alice
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   119
  $ hg amend -m 'tweak a'
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   120
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   121
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
   122
  $ hg pull ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   123
  pulling from ../public
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   124
  searching for changes
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   125
  no changes found
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
   126
  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
   127
  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
   128
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   129
  $ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   130
  @  2:98bb3a6cfe1a tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   131
  |   () draft
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   132
  | o  1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   133
  |/    () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   134
  o  0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   135
      () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   136
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   137
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
   138
------------------------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   139
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   140
  $ hg evolve --list
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   141
  98bb3a6cfe1a: tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   142
    phase-divergent: 4d1169d82e47 (immutable precursor)
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   143
  
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   144
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   145
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   146
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
   147
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   148
XXX-Pulkit: this is not helpful
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   149
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   150
XXX-Marmoute: public changeset "instable themself"
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   151
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
   152
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
   153
  $ hg evolve -r 4d1169d8 --list
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   154
  4d1169d82e47: modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   155
  
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   156
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   157
Understanding phasedivergence using obslog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   158
------------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   159
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   160
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
   161
  $ hg obslog -r . --all
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   162
  @  98bb3a6cfe1a (2) tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   163
  |
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   164
  o  4d1169d82e47 (1) modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   165
       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
   166
  
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   167
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
   168
--------------------------------------------------
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   169
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   170
(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
   171
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
   172
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
   173
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   174
  $ hg evolve
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   175
  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
   176
  (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
   177
  [2]
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   178
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   179
testing the --confirm option
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   180
  $ hg evolve --phase-divergent --confirm <<EOF
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   181
  > n
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   182
  > EOF
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
  perform evolve? [Ny] n
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   186
  abort: evolve aborted by user
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   187
  [255]
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   188
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   189
testing the --dry-run option
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   190
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   191
  $ hg evolve --phase-divergent --dry-run
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   192
  recreate:[2] tweak a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   193
  atop:[1] modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   194
  hg rebase --rev 98bb3a6cfe1a --dest d3873e73d99e;
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   195
  hg update 4d1169d82e47;
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   196
  hg revert --all --rev 98bb3a6cfe1a;
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   197
  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
   198
3618
2d8e39919742 tests: various comment on test-evolve-phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3617
diff changeset
   199
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
   200
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
   201
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   202
  $ 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
   203
  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
   204
  atop:[1] modify a
4453
700b8b3a5a54 evolve: clarify output when phase-divergence resolution results in no change
Martin von Zweigbergk <martinvonz@google.com>
parents: 4452
diff changeset
   205
  no changes to commit
1150
2c99d92faa62 evolve: fix error during iteration over bumped changesets (bug38)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   206
  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
   207
3617
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   208
  $ hg glog
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   209
  @  1:4d1169d82e47 modify a
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   210
  |   () public
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   211
  o  0:d3873e73d99e init
a0e322641810 tests: make test-evolve-phase-divergence more descriptive
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3610
diff changeset
   212
      () public
3620
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   213
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   214
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
   215
--------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   216
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   217
  $ 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
   218
  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
   219
  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
   220
  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
   221
  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
   222
  [1]
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   223
  $ 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
   224
  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
   225
  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
   226
  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
   227
  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
   228
  [1]
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   229
  $ 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
   230
  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
   231
  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
   232
  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
   233
  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
   234
  [1]
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   235
4495
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   236
phase-divergence that lead to new commit and bookmark movement
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   237
==============================================================
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   238
3620
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   239
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
   240
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
   241
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   242
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
   243
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   244
  $ 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
   245
  $ 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
   246
  $ 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
   247
  $ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   248
  @  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
   249
  |   () draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   250
  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
   251
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   252
  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
   253
      () public
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
  $ 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
   256
  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
   257
  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
   258
  adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   259
  adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   260
  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
   261
  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
   262
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   263
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
   264
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   265
  $ cd ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   266
  $ 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
   267
  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
   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
4181
ab3581bc0637 branching: preserve the expected output on default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4165
diff changeset
   273
  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
   274
  (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
   275
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   276
  $ 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
   277
  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
   278
  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
   279
  adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   280
  adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   281
  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
   282
  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
   283
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   284
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
   285
phase-divergence
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   286
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   287
  $ cd ../alice
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   288
  $ 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
   289
  $ 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
   290
  $ 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
   291
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   292
  $ 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
   293
  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
   294
  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
   295
  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
   296
  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
   297
  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
   298
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   299
  $ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   300
  @  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
   301
  |   (bm) draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   302
  | 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
   303
  |/    () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   304
  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
   305
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   306
  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
   307
      () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   308
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   309
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
   310
--------------------------------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   311
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   312
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
   313
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
   314
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   315
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
   316
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
   317
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   318
  $ 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
   319
  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
   320
  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
   321
  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
   322
  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
   323
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   324
  $ hg exp
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   325
  # 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
   326
  # User test
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   327
  # 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
   328
  #      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
  # 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
   330
  # Parent  aa071e5554e36080a36cfd24accd5a71e3320f1e
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   331
  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
   332
  
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   333
  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
   334
  
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   335
  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
   336
  --- 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
   337
  +++ 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
   338
  @@ -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
   339
   foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   340
  +bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   341
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   342
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
   343
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
   344
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   345
  $ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   346
  @  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
   347
  |   (bm) draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   348
  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
   349
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   350
  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
   351
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   352
  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
   353
      () public
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
  $ 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
   356
  @  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
   357
  |
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   358
  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
   359
  |    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
   360
  |
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   361
  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
   362
       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
   363
  
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   364
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   365
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
   366
------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   367
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   368
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
   369
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
   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 ../bob
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 ../bob
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 ../private
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 ../private
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
  $ 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
   390
  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
   391
  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
   392
  adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   393
  adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   394
  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
   395
  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
   396
  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
   397
4495
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   398
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   399
phase divergence rebasing back to old changeset - with (unrelated?) conflict
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   400
============================================================================
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   401
3620
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   402
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
   403
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
   404
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
   405
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
   406
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   407
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
   408
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   409
  $ 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
   410
  $ 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
   411
  $ 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
   412
  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
   413
  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
   414
  adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   415
  adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   416
  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
   417
  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
   418
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   419
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
   420
  $ cd ../bob
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   421
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   422
  $ 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
   423
  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
   424
  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
   425
  adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   426
  adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   427
  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
   428
  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
   429
  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
   430
  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
   431
  (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
   432
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   433
  $ 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
   434
  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
   435
  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
   436
  adding changesets
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   437
  adding manifests
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   438
  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
   439
  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
   440
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   441
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
   442
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   443
  $ cd ../alice
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   444
  $ 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
   445
  $ 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
   446
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   447
  $ 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
   448
  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
   449
  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
   450
  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
   451
  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
   452
  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
   453
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   454
  $ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   455
  @  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
   456
  |   (bm) draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   457
  | 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
   458
  |/    () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   459
  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
   460
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   461
  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
   462
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   463
  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
   464
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   465
  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
   466
      () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   467
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   468
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
   469
---------------------------------------------------------------
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   470
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   471
  $ 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
   472
  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
   473
  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
   474
  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
   475
  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
   476
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   477
  $ hg exp
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   478
  # 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
   479
  # User test
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   480
  # 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
   481
  #      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
   482
  # 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
   483
  # Parent  b756eb10ea73ee4ba69c998e64a5c6e1005d74b5
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   484
  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
   485
  
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   486
  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
   487
  
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   488
  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
   489
  --- 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
   490
  +++ 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
   491
  @@ -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
   492
  -bar
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   493
  +foo
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   494
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   495
  $ hg glog
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   496
  @  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
   497
  |   (bm) draft
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   498
  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
   499
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   500
  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
   501
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   502
  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
   503
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   504
  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
   505
  |   () public
1f020455f6fe tests: add more tests for handling of phase divergence by `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3619
diff changeset
   506
  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
   507
      () 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
   508
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   509
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
   510
----------------------------
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   511
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   512
  $ 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
   513
  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
   514
  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
   515
  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
   516
  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
   517
  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
   518
  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
   519
  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
   520
  $ 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
   521
  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
   522
  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
   523
  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
   524
  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
   525
  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
   526
  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
   527
  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
   528
4495
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   529
different parents for successors and predecessors
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   530
=================================================
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   531
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   532
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
   533
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
   534
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   535
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
   536
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   537
  $ 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
   538
  $ 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
   539
  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
   540
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   541
  $ 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
   542
  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
   543
  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
   544
  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
   545
  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
   546
  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
   547
  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
   548
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   549
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
   550
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
   551
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   552
  $ 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
   553
  $ 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
   554
  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
   555
  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
   556
  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
   557
  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
   558
  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
   559
  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
   560
  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
   561
  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
   562
  (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
   563
  $ 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
   564
  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
   565
  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
   566
  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
   567
  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
   568
  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
   569
  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
   570
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   571
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
   572
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
   573
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   574
  $ 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
   575
  $ 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
   576
  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
   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 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
   579
  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
   580
  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
   581
  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
   582
  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
   583
  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
   584
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   585
  $ 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
   586
  @  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
   587
  |
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   588
  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
   589
       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
   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
  $ 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
   592
  @  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
   593
  |   (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
   594
  | 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
   595
  | |   () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   596
  | 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
   597
  | |   () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   598
  | 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
   599
  |/    () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   600
  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
   601
  |   () public
7e253bbac9a1 tests: show first line of commit message in test-evolve-phase-divergence.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3624
diff changeset
   602
  ~
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   603
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   604
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
   605
---------------------------------------------
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   606
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   607
  $ 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
   608
  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
   609
  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
   610
  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
   611
  (leaving bookmark bm)
4453
700b8b3a5a54 evolve: clarify output when phase-divergence resolution results in no change
Martin von Zweigbergk <martinvonz@google.com>
parents: 4452
diff changeset
   612
  no changes to commit
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   613
  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
   614
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   615
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
   616
  $ hg glog
3624
6756f2a85f5b evolve: make sure bookmarks are moved after phase-divergence resolution
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3623
diff changeset
   617
  @  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
   618
  |   (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
   619
  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
   620
  |   () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   621
  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
   622
  |   () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   623
  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
   624
  |   () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   625
  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
   626
  |   () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   627
  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
   628
  |   () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   629
  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
   630
      () public
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   631
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   632
  $ 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
   633
  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
   634
  |    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
   635
  |
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   636
  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
   637
  |    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
   638
  |
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   639
  @  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
   640
       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
   641
  
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   642
3621
db3ec5f79ab9 tests: add one more test case about handling of phase-divergence by evolve
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3620
diff changeset
   643
  $ 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
   644
  # 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
   645
  # 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
   646
  # 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
   647
  #      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
   648
  # Node ID 2352021b37851be226ebed109b0eb6eada918566
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   649
  # 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
   650
  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
   651
  
3623
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   652
  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
   653
  --- /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
   654
  +++ 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
   655
  @@ -0,0 +1,1 @@
71fbb679e311 evolve: use the new rebased changeset to resolve phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3621
diff changeset
   656
  +x
3626
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   657
4495
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   658
divergence with parent+content change both, no conflict
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   659
=======================================================
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   660
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   661
Creating divergence with parent cand content change both but not resulting in
3626
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   662
conflicts
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   663
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   664
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
   665
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   666
  $ hg glog
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   667
  @  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
   668
  |   (bm) public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   669
  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
   670
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   671
  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
   672
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   673
  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
   674
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   675
  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
   676
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   677
  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
   678
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   679
  o  0:d3873e73d99e init
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   680
      () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   681
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   682
  $ echo y > y
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   683
  $ echo foobar >> foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   684
  $ hg add y
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   685
  $ 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
   686
  $ hg rebase -r . -d .^^^
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   687
  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
   688
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   689
  $ echo foo > y
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   690
  $ hg amend
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   691
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   692
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
   693
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   694
  $ 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
   695
  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
   696
  $ hg glog
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   697
  @  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
   698
  |   () draft
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   699
  | 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
   700
  | |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   701
  | 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
   702
  | |   (bm) public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   703
  | 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
   704
  |/    () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   705
  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
   706
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   707
  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
   708
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   709
  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
   710
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   711
  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
   712
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   713
  o  0:d3873e73d99e init
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   714
      () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   715
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   716
  $ hg obslog -r .
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   717
  @  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
   718
  |
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   719
  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
   720
  |    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
   721
  |
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   722
  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
   723
       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
   724
  
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   725
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
   726
-------------------------------------
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   727
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   728
  $ hg evolve --phase-divergent
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   729
  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
   730
  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
   731
  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
   732
  committed as 8c2bb6fb44e9
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   733
  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
   734
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   735
  $ hg exp
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   736
  # HG changeset patch
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   737
  # User test
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   738
  # Date 0 0
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   739
  #      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
   740
  # Node ID 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   741
  # Parent  dc88f5aa9bc90a6418899d267d9524205dfb429b
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   742
  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
   743
  
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   744
  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
   745
  
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   746
  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
   747
  --- 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
   748
  +++ 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
   749
  @@ -1,1 +1,1 @@
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   750
  -y
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   751
  +foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   752
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   753
  $ hg glog
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   754
  @  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
   755
  |   () draft
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   756
  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
   757
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   758
  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
   759
  |   (bm) public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   760
  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
   761
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   762
  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
   763
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   764
  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
   765
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   766
  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
   767
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   768
  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
   769
  |   () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   770
  o  0:d3873e73d99e init
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   771
      () public
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   772
4495
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   773
divergence with parent+content change both, with conflict
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   774
=========================================================
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
   775
3626
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   776
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
   777
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
   778
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   779
  $ echo l > l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   780
  $ 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
   781
  $ hg rebase -r . -d .^^^^
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   782
  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
   783
  $ echo kl > l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   784
  $ echo foo > x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   785
  $ hg add x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   786
  $ hg amend
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
  $ hg obslog -r .
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   789
  @  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
   790
  |
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   791
  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
   792
  |    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
   793
  |
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   794
  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
   795
       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
   796
  
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 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
   799
  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
   800
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   801
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
   802
----------------------------------------------
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   803
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   804
  $ hg evolve --phase-divergent
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   805
  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
   806
  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
   807
  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
   808
  merging x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   809
  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
   810
  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
   811
  [1]
3626
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   812
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   813
  $ hg diff
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   814
  diff -r 8c2bb6fb44e9 l
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   815
  --- /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
   816
  +++ 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
   817
  @@ -0,0 +1,1 @@
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   818
  +kl
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   819
  diff -r 8c2bb6fb44e9 x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   820
  --- 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
   821
  +++ 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
   822
  @@ -1,1 +1,5 @@
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   823
  +<<<<<<< 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
   824
   x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   825
  +=======
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   826
  +foo
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   827
  +>>>>>>> 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
   828
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   829
  $ echo foo > x
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   830
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   831
  $ hg resolve -m
760210aa0d78 tests: add tests of content+parent change creating phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3625
diff changeset
   832
  (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
   833
  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
   834
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   835
  $ hg evolve --continue
3633
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   836
  evolving 19:5fd38c0de46e "added l to l"
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   837
  committed as e3090241a10c
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   838
  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
   839
3628
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   840
  $ hg glog
3633
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   841
  @  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
   842
  |   () draft
3633
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   843
  o  17:f3794e5a91dc added l to l
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   844
  |   () public
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   845
  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
   846
  |   () public
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   847
  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
   848
  |   () public
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   849
  o  9:2352021b3785 added x to x
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   850
  |   (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
   851
  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
   852
  |   () public
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   853
  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
   854
  |   () public
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   855
  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
   856
  |   () public
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   857
  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
   858
  |   () public
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   859
  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
   860
  |   () public
170b99a9c0b4 evolve: write data to evolvestate in case on conflicts in phase-divergence
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3626
diff changeset
   861
  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
   862
      () public
3633
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   863
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   864
  $ hg exp
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   865
  # HG changeset patch
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   866
  # User test
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   867
  # Date 0 0
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   868
  #      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
  # Node ID e3090241a10c320b6132e4673915fd6b19c0de39
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   870
  # Parent  f3794e5a91dc1d4d36fee5c423386b19433a1f48
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   871
  phase-divergent update to f3794e5a91dc:
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   872
  
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   873
  added l to l
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   874
  
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   875
  diff -r f3794e5a91dc -r e3090241a10c l
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   876
  --- 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
   877
  +++ 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
   878
  @@ -1,1 +1,1 @@
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   879
  -l
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   880
  +kl
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   881
  diff -r f3794e5a91dc -r e3090241a10c x
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   882
  --- 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
   883
  +++ 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
   884
  @@ -1,1 +1,1 @@
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   885
  -x
ed3032ee53eb evolve: handle interrupted phase-divergence resolution gracefully
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3629
diff changeset
   886
  +foo
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   887
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   888
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
   889
------------------------------------------------------------------------
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   890
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   891
  $ hg glog -r .
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   892
  @  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
   893
  |   () draft
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
  $ echo f > f
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   896
  $ 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
   897
  $ echo g > g
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   898
  $ 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
   899
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   900
  $ 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
   901
  2 changesets folded
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   902
  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
   903
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   904
  $ hg evolve --list
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   905
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   906
  $ 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
   907
  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
   908
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   909
  $ hg glog -r f3794e5a91dc::
4340
5300be965515 fold: sort concatenated commit messages in topological order
Martin von Zweigbergk <martinvonz@google.com>
parents: 4181
diff changeset
   910
  @  24:390acb97e50a added f
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   911
  |   () draft
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   912
  | 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
   913
  | |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   914
  | 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
   915
  |/    () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   916
  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
   917
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   918
  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
   919
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   920
  ~
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   921
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   922
  $ hg evolve --list
4340
5300be965515 fold: sort concatenated commit messages in topological order
Martin von Zweigbergk <martinvonz@google.com>
parents: 4181
diff changeset
   923
  390acb97e50a: added f
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   924
    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
   925
    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
   926
  
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   927
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
   928
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   929
  $ hg evolve --phase-divergent --all
4340
5300be965515 fold: sort concatenated commit messages in topological order
Martin von Zweigbergk <martinvonz@google.com>
parents: 4181
diff changeset
   930
  recreate:[24] added f
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   931
  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
   932
  rebasing to destination parent: 21ae52e414e6
4453
700b8b3a5a54 evolve: clarify output when phase-divergence resolution results in no change
Martin von Zweigbergk <martinvonz@google.com>
parents: 4452
diff changeset
   933
  no changes to commit
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   934
  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
   935
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   936
  $ 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
   937
  @  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
   938
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   939
  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
   940
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   941
  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
   942
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   943
  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
   944
  |   () public
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   945
  ~
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   946
4455
b58e45aa9be2 test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
   947
When the public changesets is split causing phase-divergence
b58e45aa9be2 test: use 'split' instead of 'splitted' in the tests
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
   948
------------------------------------------------------------
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   949
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   950
  $ cd ../split
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   951
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   952
  $ echo m > m
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   953
  $ echo n > n
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 and n"
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   955
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   956
  $ hg glog
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   957
  @  1:a51bce62c219 added m and n
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   958
  |   () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   959
  o  0:d3873e73d99e init
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   960
      () public
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   961
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   962
  $ hg prev
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   963
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   964
  [0] init
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   965
  $ echo m > m
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   966
  $ 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
   967
  $ echo n > n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   968
  $ 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
   969
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   970
  $ hg glog
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   971
  @  3:e1154ec0206a added n
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   972
  |   () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   973
  o  2:4f25cd9cd2bf added m
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   974
  |   () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   975
  | o  1:a51bce62c219 added m and n
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   976
  |/    () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   977
  o  0:d3873e73d99e init
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   978
      () public
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   979
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   980
  $ hg prune -r a51bce62c219 --succ 4f25cd9cd2bf --succ e1154ec0206a --split
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   981
  1 changesets pruned
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   982
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   983
  $ hg phase -r a51bce62c219 --hidden --public
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   984
  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
   985
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   986
  $ hg glog
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   987
  @  3:e1154ec0206a added n
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   988
  |   () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   989
  *  2:4f25cd9cd2bf added m
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   990
  |   () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   991
  | o  1:a51bce62c219 added m and n
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   992
  |/    () public
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   993
  o  0:d3873e73d99e init
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   994
      () public
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   995
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
   996
  $ hg evolve --all --phase-divergent
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   997
  recreate:[2] added m
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   998
  atop:[1] added m and n
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
   999
  committed as 86419909e017
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1000
  1 new orphan changesets
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1001
  recreate:[3] added n
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1002
  atop:[1] added m and n
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1003
  rebasing to destination parent: d3873e73d99e
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1004
  committed as 89ba615ea1ec
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1005
  working directory is now at 89ba615ea1ec
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1006
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1007
XXX: this is messy, we should solve things in better way
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1008
  $ hg glog --hidden
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1009
  @  6:89ba615ea1ec phase-divergent update to a51bce62c219:
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1010
  |   () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1011
  | x  5:ee4af146c5cf added n
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1012
  | |   () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1013
  +---o  4:86419909e017 phase-divergent update to a51bce62c219:
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1014
  | |     () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1015
  | | x  3:e1154ec0206a added n
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1016
  | | |   () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1017
  | | x  2:4f25cd9cd2bf added m
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1018
  | |/    () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1019
  o |  1:a51bce62c219 added m and n
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1020
  |/    () public
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1021
  o  0:d3873e73d99e init
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1022
      () public
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1023
4457
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1024
  $ hg obslog -r a51bce62c219 --all
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1025
  o  86419909e017 (4) phase-divergent update to a51bce62c219:
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1026
  |
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1027
  | @  89ba615ea1ec (6) phase-divergent update to a51bce62c219:
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1028
  | |
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1029
  x |  4f25cd9cd2bf (2) added m
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1030
  | |    rewritten(description, parent, content) as 86419909e017 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1031
  | |
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1032
  | x  ee4af146c5cf (5) added n
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1033
  | |    rewritten(description, parent, content) as 89ba615ea1ec using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1034
  | |
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1035
  | x  e1154ec0206a (3) added n
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1036
  |/     rewritten(parent) as ee4af146c5cf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1037
  |
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1038
  o  a51bce62c219 (1) added m and n
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1039
       rewritten(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1040
  
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1041
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1042
XXX: not sure this is the correct
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1043
  $ hg exp 89ba615ea1ec
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1044
  # HG changeset patch
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1045
  # User test
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1046
  # Date 0 0
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1047
  #      Thu Jan 01 00:00:00 1970 +0000
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1048
  # Node ID 89ba615ea1ec3ba5b25db9f7897eb29712d7e5d6
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1049
  # Parent  a51bce62c219f024bc0ae0cc0e3957ee77d7cb46
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1050
  phase-divergent update to a51bce62c219:
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1051
  
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1052
  added n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1053
  
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1054
  diff -r a51bce62c219 -r 89ba615ea1ec m
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1055
  --- 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
  1056
  +++ /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
  1057
  @@ -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
  1058
  -m
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
XXX: not sure this is correct
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1061
  $ hg exp 86419909e017
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1062
  # HG changeset patch
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1063
  # User test
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1064
  # Date 0 0
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1065
  #      Thu Jan 01 00:00:00 1970 +0000
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1066
  # Node ID 86419909e01787959aa6471aee605c6d604a3e0d
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1067
  # Parent  a51bce62c219f024bc0ae0cc0e3957ee77d7cb46
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1068
  phase-divergent update to a51bce62c219:
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1069
  
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1070
  added m
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1071
  
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1072
  diff -r a51bce62c219 -r 86419909e017 n
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1073
  --- 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
  1074
  +++ /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
  1075
  @@ -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
  1076
  -n
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1077
4495
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
  1078
When the public changeset is split across various topological branches
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
  1079
======================================================================
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1080
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1081
  $ cd ../split-across-branches
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1082
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1083
  $ echo p > p
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1084
  $ echo q > q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1085
  $ 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
  1086
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1087
  $ hg prev
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1088
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1089
  [0] init
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1090
  $ echo p > p
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1091
  $ 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
  1092
  $ hg prev
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1093
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1094
  [0] init
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1095
  $ echo q > q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1096
  $ 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
  1097
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1098
  $ hg glog
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1099
  @  3:bb87595f9a77 added q
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1100
  |   () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1101
  | o  2:a47263294745 added p
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1102
  |/    () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1103
  | o  1:90859808ece6 added p and q
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1104
  |/    () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1105
  o  0:d3873e73d99e init
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1106
      () public
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1107
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1108
  $ hg prune -r 90859808ece6 --succ a47263294745 --succ bb87595f9a77 --split
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1109
  1 changesets pruned
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1110
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1111
  $ hg phase -r 90859808ece6 --public --hidden
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1112
  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
  1113
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1114
  $ hg glog
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1115
  @  3:bb87595f9a77 added q
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1116
  |   () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1117
  | *  2:a47263294745 added p
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1118
  |/    () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1119
  | o  1:90859808ece6 added p and q
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1120
  |/    () public
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1121
  o  0:d3873e73d99e init
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1122
      () public
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1123
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1124
  $ hg evolve --list
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1125
  a47263294745: added p
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1126
    phase-divergent: 90859808ece6 (immutable precursor)
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1127
  
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1128
  bb87595f9a77: added q
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1129
    phase-divergent: 90859808ece6 (immutable precursor)
3634
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
  $ hg evolve --all --phase-divergent
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1132
  recreate:[2] added p
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1133
  atop:[1] added p and q
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1134
  committed as 25875a9cb640
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1135
  recreate:[3] added q
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1136
  atop:[1] added p and q
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1137
  committed as 26f564f94bcc
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1138
  working directory is now at 26f564f94bcc
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1139
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1140
  $ hg glog --hidden
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1141
  @  5:26f564f94bcc phase-divergent update to 90859808ece6:
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1142
  |   () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1143
  | o  4:25875a9cb640 phase-divergent update to 90859808ece6:
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1144
  |/    () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1145
  | x  3:bb87595f9a77 added q
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1146
  | |   () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1147
  | | x  2:a47263294745 added p
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1148
  | |/    () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1149
  o |  1:90859808ece6 added p and q
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1150
  |/    () public
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1151
  o  0:d3873e73d99e init
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1152
      () public
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1153
4457
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1154
  $ hg obslog -r 90859808ece6 --all
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1155
  o  25875a9cb640 (4) phase-divergent update to 90859808ece6:
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1156
  |
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1157
  | @  26f564f94bcc (5) phase-divergent update to 90859808ece6:
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1158
  | |
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1159
  x |  a47263294745 (2) added p
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1160
  | |    rewritten(description, parent, content) as 25875a9cb640 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1161
  | |
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1162
  | x  bb87595f9a77 (3) added q
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1163
  |/     rewritten(description, parent, content) as 26f564f94bcc using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1164
  |
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1165
  o  90859808ece6 (1) added p and q
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1166
       rewritten(description, content) as a47263294745, bb87595f9a77 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1167
  
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1168
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1169
XXX: not sure this is correct
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1170
  $ hg exp 26f564f94bcc
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1171
  # HG changeset patch
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1172
  # User test
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1173
  # Date 0 0
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1174
  #      Thu Jan 01 00:00:00 1970 +0000
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1175
  # Node ID 26f564f94bcc34e049eb112fd14ab1e5286f2325
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1176
  # Parent  90859808ece64c9ca64dd29992db42353c70f164
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1177
  phase-divergent update to 90859808ece6:
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1178
  
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1179
  added q
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1180
  
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1181
  diff -r 90859808ece6 -r 26f564f94bcc p
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1182
  --- 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
  1183
  +++ /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
  1184
  @@ -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
  1185
  -p
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1186
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1187
XXX: not sure this is correct
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1188
  $ hg exp 25875a9cb640
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1189
  # HG changeset patch
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1190
  # User test
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1191
  # Date 0 0
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1192
  #      Thu Jan 01 00:00:00 1970 +0000
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1193
  # Node ID 25875a9cb6400973b846c94f6a80410067c2cb1f
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1194
  # Parent  90859808ece64c9ca64dd29992db42353c70f164
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1195
  phase-divergent update to 90859808ece6:
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1196
  
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1197
  added p
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1198
  
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1199
  diff -r 90859808ece6 -r 25875a9cb640 q
3634
a9fed41c6bed tests: add more tests for solving phase-divergence using `hg evolve`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3633
diff changeset
  1200
  --- 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
  1201
  +++ /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
  1202
  @@ -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
  1203
  -q
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1204
4456
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1205
When the public changeset is split and amended
4495
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
  1206
==============================================
4456
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1207
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1208
  $ cd ../split-and-amend
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1209
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1210
  $ echo m > m
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1211
  $ echo n > n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1212
  $ hg ci -Aqm "added m and n"
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1213
  $ hg prev
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1214
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1215
  [0] init
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1216
  $ echo m > m
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1217
  $ hg ci -Aqm "added m"
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1218
  $ echo n > n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1219
  $ hg ci -Aqm "added n"
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1220
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1221
  $ hg glog
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1222
  @  3:e1154ec0206a added n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1223
  |   () draft
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1224
  o  2:4f25cd9cd2bf added m
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1225
  |   () draft
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1226
  | o  1:a51bce62c219 added m and n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1227
  |/    () draft
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1228
  o  0:d3873e73d99e init
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1229
      () public
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1230
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1231
  $ hg prune -r a51bce62c219 --succ 4f25cd9cd2bf --succ e1154ec0206a --split
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1232
  1 changesets pruned
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1233
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1234
  $ echo n2 > n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1235
  $ hg amend
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1236
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1237
  $ hg phase -r a51bce62c219 --public --hidden
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1238
  2 new phase-divergent changesets
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1239
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1240
  $ hg glog
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1241
  @  4:52ca78bb98c7 added n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1242
  |   () draft
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1243
  *  2:4f25cd9cd2bf added m
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1244
  |   () draft
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1245
  | o  1:a51bce62c219 added m and n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1246
  |/    () public
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1247
  o  0:d3873e73d99e init
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1248
      () public
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1249
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1250
  $ hg evolve --list
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1251
  4f25cd9cd2bf: added m
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1252
    phase-divergent: a51bce62c219 (immutable precursor)
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1253
  
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1254
  52ca78bb98c7: added n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1255
    phase-divergent: a51bce62c219 (immutable precursor)
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1256
  
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1257
  $ hg evolve --all --phase-divergent
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1258
  recreate:[2] added m
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1259
  atop:[1] added m and n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1260
  committed as 86419909e017
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1261
  1 new orphan changesets
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1262
  recreate:[4] added n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1263
  atop:[1] added m and n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1264
  rebasing to destination parent: d3873e73d99e
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1265
  committed as 88b0dae5369a
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1266
  working directory is now at 88b0dae5369a
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1267
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1268
  $ hg glog --hidden
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1269
  @  7:88b0dae5369a phase-divergent update to a51bce62c219:
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1270
  |   () draft
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1271
  | x  6:98dad8812511 added n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1272
  | |   () draft
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1273
  +---o  5:86419909e017 phase-divergent update to a51bce62c219:
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1274
  | |     () draft
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1275
  | | x  4:52ca78bb98c7 added n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1276
  | | |   () draft
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1277
  | | | x  3:e1154ec0206a added n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1278
  | | |/    () draft
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1279
  | | x  2:4f25cd9cd2bf added m
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1280
  | |/    () draft
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1281
  o |  1:a51bce62c219 added m and n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1282
  |/    () public
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1283
  o  0:d3873e73d99e init
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1284
      () public
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1285
4457
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1286
  $ hg obslog -r a51bce62c219 --all
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1287
  o  86419909e017 (5) phase-divergent update to a51bce62c219:
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1288
  |
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1289
  | @  88b0dae5369a (7) phase-divergent update to a51bce62c219:
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1290
  | |
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1291
  x |  4f25cd9cd2bf (2) added m
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1292
  | |    rewritten(description, parent, content) as 86419909e017 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1293
  | |
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1294
  | x  98dad8812511 (6) added n
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1295
  | |    rewritten(description, parent, content) as 88b0dae5369a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1296
  | |
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1297
  | x  52ca78bb98c7 (4) added n
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1298
  | |    rewritten(parent) as 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1299
  | |
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1300
  | x  e1154ec0206a (3) added n
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1301
  |/     rewritten(content) as 52ca78bb98c7 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1302
  |
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1303
  o  a51bce62c219 (1) added m and n
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1304
       rewritten(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000)
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1305
  
218fa7c1fe4b tests: add obslog output to some tests for divergence resolution
Martin von Zweigbergk <martinvonz@google.com>
parents: 4456
diff changeset
  1306
4456
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1307
XXX: not sure this is correct
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1308
  $ hg exp 86419909e017
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1309
  # HG changeset patch
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1310
  # User test
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1311
  # Date 0 0
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1312
  #      Thu Jan 01 00:00:00 1970 +0000
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1313
  # Node ID 86419909e01787959aa6471aee605c6d604a3e0d
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1314
  # Parent  a51bce62c219f024bc0ae0cc0e3957ee77d7cb46
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1315
  phase-divergent update to a51bce62c219:
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1316
  
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1317
  added m
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1318
  
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1319
  diff -r a51bce62c219 -r 86419909e017 n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1320
  --- a/n	Thu Jan 01 00:00:00 1970 +0000
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1321
  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1322
  @@ -1,1 +0,0 @@
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1323
  -n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1324
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1325
XXX: not sure this is correct
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1326
  $ hg exp 88b0dae5369a
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1327
  # HG changeset patch
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1328
  # User test
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1329
  # Date 0 0
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1330
  #      Thu Jan 01 00:00:00 1970 +0000
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1331
  # Node ID 88b0dae5369aaa3bceb6c0b647542594e2c72fb7
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1332
  # Parent  a51bce62c219f024bc0ae0cc0e3957ee77d7cb46
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1333
  phase-divergent update to a51bce62c219:
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1334
  
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1335
  added n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1336
  
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1337
  diff -r a51bce62c219 -r 88b0dae5369a m
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1338
  --- a/m	Thu Jan 01 00:00:00 1970 +0000
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1339
  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1340
  @@ -1,1 +0,0 @@
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1341
  -m
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1342
  diff -r a51bce62c219 -r 88b0dae5369a n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1343
  --- a/n	Thu Jan 01 00:00:00 1970 +0000
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1344
  +++ b/n	Thu Jan 01 00:00:00 1970 +0000
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1345
  @@ -1,1 +1,1 @@
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1346
  -n
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1347
  +n2
b0d755a95f6c tests: add tests for divergence resolution with split+amend
Martin von Zweigbergk <martinvonz@google.com>
parents: 4455
diff changeset
  1348
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1349
Testing the evolution of a phase-divergent merge with no conflicts
4495
48e9169633ef test: cleanup title and doc phase-divergent cases
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4489
diff changeset
  1350
==================================================================
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1351
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1352
  $ cd ../merge-no-conflict
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1353
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1354
  $ echo h > h
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1355
  $ hg ci -Aqm "added h"
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1356
  $ hg prev
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1357
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1358
  [0] init
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1359
  $ echo i > i
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1360
  $ hg ci -Aqm "added i"
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1361
  $ hg merge -r a53d182199c1
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1362
  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
  1363
  (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
  1364
  $ 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
  1365
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1366
  $ hg glog
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1367
  @    3:205b2f5ecb7b merge h and i
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1368
  |\    () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1369
  | o  2:f0be5e638ecf added i
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1370
  | |   () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1371
  o |  1:a53d182199c1 added h
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1372
  |/    () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1373
  o  0:d3873e73d99e init
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1374
      () public
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1375
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1376
  $ hg up a53d182199c1
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1377
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1378
  $ hg merge -r f0be5e638ecf
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1379
  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
  1380
  (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
  1381
  $ 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
  1382
  created new head
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1383
  $ hg glog
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1384
  @    4:8d4acf488ab5 merge h and i successor
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1385
  |\    () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1386
  +---o  3:205b2f5ecb7b merge h and i
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1387
  | |/    () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1388
  | o  2:f0be5e638ecf added i
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1389
  | |   () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1390
  o |  1:a53d182199c1 added h
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1391
  |/    () draft
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1392
  o  0:d3873e73d99e init
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1393
      () public
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1394
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1395
  $ hg prune -r 205b2f5ecb7b --succ .
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1396
  1 changesets pruned
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1397
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1398
  $ hg phase 205b2f5ecb7b --hidden --public
3637
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1399
  1 new phase-divergent changesets
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1400
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1401
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
  1402
1b9c2720faee tests: add test about handling phase-divergent merges
Pulkit Goyal <7895pulkit@gmail.com>
parents: 3634
diff changeset
  1403
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
  1404
  $ hg evolve --phase-divergent
4452
444e664616c7 tests: reduce dependence on previous tests for setup
Martin von Zweigbergk <martinvonz@google.com>
parents: 4448
diff changeset
  1405
  skipping 8d4acf488ab5 : we do not handle merge yet
4497
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1406
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1407
Check we preserve "cancelation" of changes
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1408
==========================================
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1409
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1410
This tests case where the phase divergence changesets cancelled some of the
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1411
change made by the public predecessors. The cancellation of these changes need
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1412
to be preserved.
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1413
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1414
  $ hg init cancelled-changes
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1415
  $ cd cancelled-changes
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1416
  $ cat << EOF > numbers
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1417
  > 1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1418
  > 2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1419
  > 3
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1420
  > 4
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1421
  > 5
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1422
  > 6
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1423
  > 7
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1424
  > 8
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1425
  > 9
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1426
  > EOF
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1427
  $ cat << EOF > letters
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1428
  > a
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1429
  > b
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1430
  > c
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1431
  > d
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1432
  > e
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1433
  > f
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1434
  > g
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1435
  > h
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1436
  > i
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1437
  > EOF
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1438
  $ cat << EOF > romans
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1439
  > I
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1440
  > II
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1441
  > III
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1442
  > IV
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1443
  > V
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1444
  > VI
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1445
  > VII
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1446
  > VIII
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1447
  > IX
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1448
  > EOF
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1449
  $ hg add numbers letters romans
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1450
  $ hg commit -m root
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1451
  $ cat << EOF > numbers
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1452
  > 1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1453
  > 2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1454
  > 3
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1455
  > four
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1456
  > 5
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1457
  > 6
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1458
  > 7
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1459
  > 8
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1460
  > nine
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1461
  > EOF
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1462
  $ cat << EOF > letters
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1463
  > a
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1464
  > b
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1465
  > c
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1466
  > D
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1467
  > e
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1468
  > f
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1469
  > g
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1470
  > h
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1471
  > i
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1472
  > EOF
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1473
  $ hg commit -m E1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1474
  $ cat << EOF > numbers
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1475
  > 1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1476
  > 2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1477
  > 3
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1478
  > 4
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1479
  > 5
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1480
  > 6
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1481
  > seven
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1482
  > 8
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1483
  > nine
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1484
  > EOF
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1485
  $ cat << EOF > letters
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1486
  > a
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1487
  > b
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1488
  > c
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1489
  > d
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1490
  > e
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1491
  > f
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1492
  > g
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1493
  > h
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1494
  > i
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1495
  > EOF
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1496
  $ cat << EOF > romans
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1497
  > I
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1498
  > ii
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1499
  > III
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1500
  > IV
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1501
  > V
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1502
  > VI
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1503
  > VII
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1504
  > VIII
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1505
  > IX
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1506
  > EOF
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1507
  $ hg commit --amend -m E2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1508
  $ hg --hidden phase --public --rev 'desc(E1)'
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1509
  1 new phase-divergent changesets
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1510
  $ hg log -G --patch --hidden --rev 'not desc("root")'
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1511
  @  changeset:   2:599454370881
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1512
  |  tag:         tip
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1513
  ~  parent:      0:6d1fdf6de7e2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1514
     user:        test
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1515
     date:        Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1516
     instability: phase-divergent
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1517
     summary:     E2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1518
  
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1519
     diff -r 6d1fdf6de7e2 -r 599454370881 numbers
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1520
     --- a/numbers	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1521
     +++ b/numbers	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1522
     @@ -4,6 +4,6 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1523
      4
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1524
      5
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1525
      6
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1526
     -7
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1527
     +seven
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1528
      8
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1529
     -9
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1530
     +nine
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1531
     diff -r 6d1fdf6de7e2 -r 599454370881 romans
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1532
     --- a/romans	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1533
     +++ b/romans	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1534
     @@ -1,5 +1,5 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1535
      I
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1536
     -II
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1537
     +ii
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1538
      III
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1539
      IV
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1540
      V
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1541
  
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1542
  o  changeset:   1:3074c7249d20
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1543
  |  user:        test
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1544
  ~  date:        Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1545
     summary:     E1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1546
  
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1547
     diff -r 6d1fdf6de7e2 -r 3074c7249d20 letters
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1548
     --- a/letters	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1549
     +++ b/letters	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1550
     @@ -1,7 +1,7 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1551
      a
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1552
      b
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1553
      c
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1554
     -d
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1555
     +D
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1556
      e
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1557
      f
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1558
      g
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1559
     diff -r 6d1fdf6de7e2 -r 3074c7249d20 numbers
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1560
     --- a/numbers	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1561
     +++ b/numbers	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1562
     @@ -1,9 +1,9 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1563
      1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1564
      2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1565
      3
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1566
     -4
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1567
     +four
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1568
      5
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1569
      6
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1570
      7
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1571
      8
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1572
     -9
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1573
     +nine
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1574
  
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1575
  $ hg evolve --list
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1576
  599454370881: E2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1577
    phase-divergent: 3074c7249d20 (immutable precursor)
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1578
  
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1579
  $ hg obslog --all --patch
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1580
  @  599454370881 (2) E2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1581
  |
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1582
  o  3074c7249d20 (1) E1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1583
       rewritten(description, content) as 599454370881 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1584
         diff -r 3074c7249d20 -r 599454370881 changeset-description
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1585
         --- a/changeset-description
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1586
         +++ b/changeset-description
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1587
         @@ -1,1 +1,1 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1588
         -E1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1589
         +E2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1590
  
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1591
         diff -r 3074c7249d20 -r 599454370881 letters
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1592
         --- a/letters	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1593
         +++ b/letters	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1594
         @@ -1,7 +1,7 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1595
          a
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1596
          b
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1597
          c
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1598
         -D
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1599
         +d
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1600
          e
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1601
          f
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1602
          g
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1603
         diff -r 3074c7249d20 -r 599454370881 numbers
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1604
         --- a/numbers	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1605
         +++ b/numbers	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1606
         @@ -1,9 +1,9 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1607
          1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1608
          2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1609
          3
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1610
         -four
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1611
         +4
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1612
          5
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1613
          6
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1614
         -7
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1615
         +seven
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1616
          8
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1617
          nine
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1618
         diff -r 3074c7249d20 -r 599454370881 romans
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1619
         --- a/romans	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1620
         +++ b/romans	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1621
         @@ -1,5 +1,5 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1622
          I
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1623
         -II
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1624
         +ii
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1625
          III
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1626
          IV
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1627
          V
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1628
  
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1629
  
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1630
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1631
  $ hg evolve --phase-divergent --rev 'desc("E2")'
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1632
  recreate:[2] E2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1633
  atop:[1] E1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1634
  committed as 9eebcb77a7e2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1635
  working directory is now at 9eebcb77a7e2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1636
  $ hg export
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1637
  # HG changeset patch
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1638
  # User test
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1639
  # Date 0 0
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1640
  #      Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1641
  # Node ID 9eebcb77a7e2b240cb7dce095bbe608b5de91cc8
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1642
  # Parent  3074c7249d2023b1fff891591d7e609695cd09c2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1643
  phase-divergent update to 3074c7249d20:
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1644
  
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1645
  E2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1646
  
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1647
  diff -r 3074c7249d20 -r 9eebcb77a7e2 letters
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1648
  --- a/letters	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1649
  +++ b/letters	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1650
  @@ -1,7 +1,7 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1651
   a
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1652
   b
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1653
   c
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1654
  -D
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1655
  +d
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1656
   e
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1657
   f
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1658
   g
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1659
  diff -r 3074c7249d20 -r 9eebcb77a7e2 numbers
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1660
  --- a/numbers	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1661
  +++ b/numbers	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1662
  @@ -1,9 +1,9 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1663
   1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1664
   2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1665
   3
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1666
  -four
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1667
  +4
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1668
   5
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1669
   6
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1670
  -7
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1671
  +seven
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1672
   8
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1673
   nine
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1674
  diff -r 3074c7249d20 -r 9eebcb77a7e2 romans
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1675
  --- a/romans	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1676
  +++ b/romans	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1677
  @@ -1,5 +1,5 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1678
   I
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1679
  -II
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1680
  +ii
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1681
   III
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1682
   IV
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1683
   V
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1684
  $ hg log -G --patch --rev 'not desc("root")'
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1685
  @  changeset:   3:9eebcb77a7e2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1686
  |  tag:         tip
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1687
  |  parent:      1:3074c7249d20
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1688
  |  user:        test
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1689
  |  date:        Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1690
  |  summary:     phase-divergent update to 3074c7249d20:
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1691
  |
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1692
  |  diff -r 3074c7249d20 -r 9eebcb77a7e2 letters
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1693
  |  --- a/letters	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1694
  |  +++ b/letters	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1695
  |  @@ -1,7 +1,7 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1696
  |   a
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1697
  |   b
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1698
  |   c
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1699
  |  -D
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1700
  |  +d
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1701
  |   e
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1702
  |   f
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1703
  |   g
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1704
  |  diff -r 3074c7249d20 -r 9eebcb77a7e2 numbers
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1705
  |  --- a/numbers	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1706
  |  +++ b/numbers	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1707
  |  @@ -1,9 +1,9 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1708
  |   1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1709
  |   2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1710
  |   3
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1711
  |  -four
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1712
  |  +4
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1713
  |   5
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1714
  |   6
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1715
  |  -7
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1716
  |  +seven
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1717
  |   8
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1718
  |   nine
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1719
  |  diff -r 3074c7249d20 -r 9eebcb77a7e2 romans
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1720
  |  --- a/romans	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1721
  |  +++ b/romans	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1722
  |  @@ -1,5 +1,5 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1723
  |   I
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1724
  |  -II
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1725
  |  +ii
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1726
  |   III
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1727
  |   IV
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1728
  |   V
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1729
  |
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1730
  o  changeset:   1:3074c7249d20
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1731
  |  user:        test
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1732
  ~  date:        Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1733
     summary:     E1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1734
  
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1735
     diff -r 6d1fdf6de7e2 -r 3074c7249d20 letters
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1736
     --- a/letters	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1737
     +++ b/letters	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1738
     @@ -1,7 +1,7 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1739
      a
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1740
      b
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1741
      c
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1742
     -d
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1743
     +D
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1744
      e
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1745
      f
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1746
      g
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1747
     diff -r 6d1fdf6de7e2 -r 3074c7249d20 numbers
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1748
     --- a/numbers	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1749
     +++ b/numbers	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1750
     @@ -1,9 +1,9 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1751
      1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1752
      2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1753
      3
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1754
     -4
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1755
     +four
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1756
      5
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1757
      6
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1758
      7
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1759
      8
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1760
     -9
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1761
     +nine
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1762
  
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1763
  $ hg obslog --patch
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1764
  @  9eebcb77a7e2 (3) phase-divergent update to 3074c7249d20:
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1765
  |
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1766
  x  599454370881 (2) E2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1767
  |    rewritten(description, parent, content) as 9eebcb77a7e2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1768
  |      (No patch available, changesets rebased)
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1769
  |
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1770
  o  3074c7249d20 (1) E1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1771
       rewritten(description, content) as 599454370881 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1772
         diff -r 3074c7249d20 -r 599454370881 changeset-description
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1773
         --- a/changeset-description
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1774
         +++ b/changeset-description
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1775
         @@ -1,1 +1,1 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1776
         -E1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1777
         +E2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1778
  
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1779
         diff -r 3074c7249d20 -r 599454370881 letters
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1780
         --- a/letters	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1781
         +++ b/letters	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1782
         @@ -1,7 +1,7 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1783
          a
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1784
          b
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1785
          c
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1786
         -D
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1787
         +d
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1788
          e
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1789
          f
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1790
          g
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1791
         diff -r 3074c7249d20 -r 599454370881 numbers
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1792
         --- a/numbers	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1793
         +++ b/numbers	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1794
         @@ -1,9 +1,9 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1795
          1
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1796
          2
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1797
          3
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1798
         -four
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1799
         +4
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1800
          5
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1801
          6
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1802
         -7
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1803
         +seven
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1804
          8
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1805
          nine
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1806
         diff -r 3074c7249d20 -r 599454370881 romans
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1807
         --- a/romans	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1808
         +++ b/romans	Thu Jan 01 00:00:00 1970 +0000
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1809
         @@ -1,5 +1,5 @@
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1810
          I
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1811
         -II
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1812
         +ii
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1813
          III
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1814
          IV
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1815
          V
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1816
  
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1817
  
711668818508 test: introduce a more complete test for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4495
diff changeset
  1818
  $ cd ..
4498
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1819
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1820
Phase divergence with file removal cancelation
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1821
==============================================
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1822
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1823
  $ hg init cancel-removal
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1824
  $ cd cancel-removal
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1825
  $ echo a > a
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1826
  $ echo b > b
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1827
  $ echo c > c
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1828
  $ echo d > d
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1829
  $ hg ci -Aqm initial
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1830
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1831
Oops, we meant to delete just 'a', but we deleted 'b' and 'c' too
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1832
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1833
  $ hg rm a b c
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1834
  $ hg ci -m 'delete a'
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1835
  $ hg revert -r .^ b
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1836
  $ hg amend
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1837
  $ hg glog --hidden --patch
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1838
  @  2:0825dcee2670 delete a
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1839
  |   () draftdiff -r 75d2b02c4a5c -r 0825dcee2670 a
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1840
  |  --- a/a	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1841
  |  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1842
  |  @@ -1,1 +0,0 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1843
  |  -a
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1844
  |  diff -r 75d2b02c4a5c -r 0825dcee2670 c
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1845
  |  --- a/c	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1846
  |  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1847
  |  @@ -1,1 +0,0 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1848
  |  -c
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1849
  |
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1850
  | x  1:dff6e52f5e41 delete a
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1851
  |/    () draftdiff -r 75d2b02c4a5c -r dff6e52f5e41 a
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1852
  |    --- a/a	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1853
  |    +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1854
  |    @@ -1,1 +0,0 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1855
  |    -a
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1856
  |    diff -r 75d2b02c4a5c -r dff6e52f5e41 b
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1857
  |    --- a/b	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1858
  |    +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1859
  |    @@ -1,1 +0,0 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1860
  |    -b
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1861
  |    diff -r 75d2b02c4a5c -r dff6e52f5e41 c
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1862
  |    --- a/c	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1863
  |    +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1864
  |    @@ -1,1 +0,0 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1865
  |    -c
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1866
  |
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1867
  o  0:75d2b02c4a5c initial
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1868
      () draftdiff -r 000000000000 -r 75d2b02c4a5c a
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1869
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1870
     +++ b/a	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1871
     @@ -0,0 +1,1 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1872
     +a
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1873
     diff -r 000000000000 -r 75d2b02c4a5c b
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1874
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1875
     +++ b/b	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1876
     @@ -0,0 +1,1 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1877
     +b
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1878
     diff -r 000000000000 -r 75d2b02c4a5c c
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1879
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1880
     +++ b/c	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1881
     @@ -0,0 +1,1 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1882
     +c
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1883
     diff -r 000000000000 -r 75d2b02c4a5c d
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1884
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1885
     +++ b/d	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1886
     @@ -0,0 +1,1 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1887
     +d
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1888
  
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1889
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1890
The public predecessors deletes'a', 'b' and 'c',
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1891
If was amended to only delete 'a', and 'c'
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1892
so the fixup should add back 'b'.
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1893
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1894
  $ hg phase -p -r dff6e52f5e41 --hidden
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1895
  1 new phase-divergent changesets
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1896
  $ hg evolve --phase-divergent
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1897
  recreate:[2] delete a
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1898
  atop:[1] delete a
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1899
  committed as 84aa492b3c37
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1900
  working directory is now at 84aa492b3c37
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1901
  $ hg glog --patch
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1902
  @  3:84aa492b3c37 phase-divergent update to dff6e52f5e41:
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1903
  |   () draftdiff -r dff6e52f5e41 -r 84aa492b3c37 b
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1904
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1905
  |  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1906
  |  @@ -0,0 +1,1 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1907
  |  +b
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1908
  |
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1909
  o  1:dff6e52f5e41 delete a
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1910
  |   () publicdiff -r 75d2b02c4a5c -r dff6e52f5e41 a
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1911
  |  --- a/a	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1912
  |  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1913
  |  @@ -1,1 +0,0 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1914
  |  -a
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1915
  |  diff -r 75d2b02c4a5c -r dff6e52f5e41 b
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1916
  |  --- a/b	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1917
  |  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1918
  |  @@ -1,1 +0,0 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1919
  |  -b
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1920
  |  diff -r 75d2b02c4a5c -r dff6e52f5e41 c
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1921
  |  --- a/c	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1922
  |  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1923
  |  @@ -1,1 +0,0 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1924
  |  -c
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1925
  |
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1926
  o  0:75d2b02c4a5c initial
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1927
      () publicdiff -r 000000000000 -r 75d2b02c4a5c a
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1928
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1929
     +++ b/a	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1930
     @@ -0,0 +1,1 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1931
     +a
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1932
     diff -r 000000000000 -r 75d2b02c4a5c b
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1933
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1934
     +++ b/b	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1935
     @@ -0,0 +1,1 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1936
     +b
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1937
     diff -r 000000000000 -r 75d2b02c4a5c c
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1938
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1939
     +++ b/c	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1940
     @@ -0,0 +1,1 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1941
     +c
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1942
     diff -r 000000000000 -r 75d2b02c4a5c d
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1943
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1944
     +++ b/d	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1945
     @@ -0,0 +1,1 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1946
     +d
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1947
  
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1948
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1949
  $ hg diff --change .
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1950
  diff -r dff6e52f5e41 -r 84aa492b3c37 b
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1951
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1952
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1953
  @@ -0,0 +1,1 @@
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1954
  +b
99dbe605fda5 test: add file cancelation scenario for phase-divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4497
diff changeset
  1955