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