tests/test-evolve-public-content-divergent.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Thu, 11 Apr 2019 22:41:06 +0200
branchstable
changeset 4510 0b86c05440e9
parent 4473 14437b18b024
child 4512 7a779a288793
permissions -rw-r--r--
changelog: merge 8.4.1 and 8.5.1 entries
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4383
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     1
Test for handling of content divergence with public cset using `hg evolve`
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     2
==========================================================================
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     3
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     4
Setup
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     5
=====
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     6
  $ cat >> $HGRCPATH <<EOF
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     7
  > [alias]
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     8
  > glog = log -GT "{rev}:{node|short} {desc|firstline}\n {phase} {troubles}\n\n"
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
     9
  > [phases]
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    10
  > publish = False
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    11
  > [extensions]
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    12
  > rebase =
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    13
  > EOF
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    14
  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    15
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    16
Testing the case when both divergent cset are on the same parent and no-conflict in merging:
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    17
-------------------------------------------------------------------------------------
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    18
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    19
Prepare the repository:
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    20
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    21
  $ hg init pubdiv
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    22
  $ cd pubdiv
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    23
  $ for ch in a b; do
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    24
  >   echo $ch > $ch;
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    25
  >   hg ci -Aqm "added "$ch;
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    26
  > done;
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    27
  $ hg glog
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    28
  @  1:5f6d8a4bf34a added b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    29
  |   draft
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    30
  |
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    31
  o  0:9092f1db7931 added a
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    32
      draft
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    33
  
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    34
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    35
Make an amend and change phase to public:
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    36
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    37
  $ sed -i "1 i I am first" b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    38
  $ hg amend
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    39
  $ hg phase --public
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    40
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    41
Amend again to create a cset divergent to public one:
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    42
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    43
  $ hg up 1 --hidden -q
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    44
  updated to hidden changeset 5f6d8a4bf34a
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    45
  (hidden revision '5f6d8a4bf34a' was rewritten as: 44f360db368f)
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    46
  working directory parent is obsolete! (5f6d8a4bf34a)
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    47
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    48
  $ echo "I am second" >> b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    49
  $ hg ci --amend -m "updated b"
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    50
  1 new content-divergent changesets
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    51
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    52
  $ hg glog
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    53
  @  3:dcdaf152280a updated b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    54
  |   draft content-divergent
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    55
  |
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    56
  | o  2:44f360db368f added b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    57
  |/    public
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    58
  |
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    59
  o  0:9092f1db7931 added a
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    60
      public
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    61
  
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    62
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    63
Lets resolve the public content-divergence:
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    64
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    65
  $ hg evolve --content-divergent
4413
2360a1e050a6 evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4412
diff changeset
    66
  merge:[2] added b
2360a1e050a6 evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4412
diff changeset
    67
  with: [3] updated b
4383
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    68
  base: [1] added b
4413
2360a1e050a6 evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4412
diff changeset
    69
  updating to "local" side of the conflict: 44f360db368f
2360a1e050a6 evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4412
diff changeset
    70
  merging "other" content-divergent changeset 'dcdaf152280a'
4383
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    71
  merging b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    72
  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    73
  committed as c1aa9cfb6cf8
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    74
  working directory is now at c1aa9cfb6cf8
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    75
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    76
Following graph log shows that it correctly merged the two divergent csets:
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    77
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    78
  $ hg glog -p
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    79
  @  5:c1aa9cfb6cf8 phase-divergent update to 44f360db368f:
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    80
  |   draft
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    81
  |
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    82
  |  diff -r 44f360db368f -r c1aa9cfb6cf8 b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    83
  |  --- a/b	Thu Jan 01 00:00:00 1970 +0000
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    84
  |  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    85
  |  @@ -1,2 +1,3 @@
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    86
  |   I am first
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    87
  |   b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    88
  |  +I am second
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    89
  |
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    90
  o  2:44f360db368f added b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    91
  |   public
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    92
  |
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    93
  |  diff -r 9092f1db7931 -r 44f360db368f b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    94
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    95
  |  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    96
  |  @@ -0,0 +1,2 @@
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    97
  |  +I am first
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    98
  |  +b
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
    99
  |
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   100
  o  0:9092f1db7931 added a
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   101
      public
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   102
  
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   103
     diff -r 000000000000 -r 9092f1db7931 a
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   104
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   105
     +++ b/a	Thu Jan 01 00:00:00 1970 +0000
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   106
     @@ -0,0 +1,1 @@
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   107
     +a
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   108
  
3343eac099ec evolve: add logic to resolve content-divergence with a public cset
Sushil khanchi <sushilkhanchi97@gmail.com>
parents:
diff changeset
   109
  $ hg evolve -l
4384
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   110
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   111
  $ cd ..
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   112
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   113
Testing the case when both divergent cset has same parent and has conflict in merging:
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   114
------------------------------------------------------------------------------
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   115
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   116
Prepare the repository:
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   117
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   118
  $ hg init pubdiv1
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   119
  $ cd pubdiv1
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   120
  $ for ch in a b; do
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   121
  >   echo $ch > $ch;
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   122
  >   hg ci -Aqm "added "$ch;
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   123
  > done;
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   124
  $ hg glog
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   125
  @  1:5f6d8a4bf34a added b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   126
  |   draft
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   127
  |
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   128
  o  0:9092f1db7931 added a
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   129
      draft
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   130
  
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   131
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   132
Make an amend and change phase to public:
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   133
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   134
  $ echo "I am foo" > b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   135
  $ hg amend
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   136
  $ hg phase --public
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   137
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   138
Amend again to create a cset divergent to public one:
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   139
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   140
  $ hg up 1 --hidden -q
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   141
  updated to hidden changeset 5f6d8a4bf34a
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   142
  (hidden revision '5f6d8a4bf34a' was rewritten as: 580f2d01e52c)
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   143
  working directory parent is obsolete! (5f6d8a4bf34a)
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   144
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   145
  $ echo "I am bar" > b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   146
  $ hg ci --amend -m "updated b"
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   147
  1 new content-divergent changesets
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   148
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   149
  $ hg glog
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   150
  @  3:0e805383168e updated b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   151
  |   draft content-divergent
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   152
  |
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   153
  | o  2:580f2d01e52c added b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   154
  |/    public
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   155
  |
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   156
  o  0:9092f1db7931 added a
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   157
      public
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   158
  
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   159
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   160
Lets resolve the divergence:
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   161
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   162
  $ hg evolve --content-divergent
4413
2360a1e050a6 evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4412
diff changeset
   163
  merge:[2] added b
2360a1e050a6 evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4412
diff changeset
   164
  with: [3] updated b
4384
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   165
  base: [1] added b
4413
2360a1e050a6 evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4412
diff changeset
   166
  updating to "local" side of the conflict: 580f2d01e52c
2360a1e050a6 evolve: pin the public cset to local side in merging when solving public div
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4412
diff changeset
   167
  merging "other" content-divergent changeset '0e805383168e'
4384
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   168
  merging b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   169
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   170
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   171
  fix conflicts and see `hg help evolve.interrupted`
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   172
  [1]
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   173
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   174
  $ echo "I am foobar" > b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   175
  $ hg resolve -m --tool union
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   176
  (no more unresolved files)
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   177
  continue: hg evolve --continue
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   178
  $ hg evolve --continue
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   179
  committed as 1a739394e9d4
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   180
  working directory is now at 1a739394e9d4
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   181
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   182
  $ hg glog
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   183
  @  5:1a739394e9d4 phase-divergent update to 580f2d01e52c:
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   184
  |   draft
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   185
  |
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   186
  o  2:580f2d01e52c added b
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   187
  |   public
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   188
  |
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   189
  o  0:9092f1db7931 added a
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   190
      public
8993fd4805d0 evolve: update the public divergence resolution logic to cover --continue case
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4383
diff changeset
   191
  
4385
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   192
Testing the case when divergence is not created by actual diff change, but because of rebasing:
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   193
------------------------------------------------------------------------------------------------
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   194
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   195
Prepare the repo:
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   196
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   197
  $ cd ..
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   198
  $ hg init rebasediv
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   199
  $ cd rebasediv
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   200
  $ for ch in a b c; do
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   201
  >   echo $ch > $ch;
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   202
  >   hg ci -Am "added "$ch;
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   203
  > done;
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   204
  adding a
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   205
  adding b
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   206
  adding c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   207
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   208
  $ hg glog
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   209
  @  2:155349b645be added c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   210
  |   draft
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   211
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   212
  o  1:5f6d8a4bf34a added b
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   213
  |   draft
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   214
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   215
  o  0:9092f1db7931 added a
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   216
      draft
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   217
  
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   218
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   219
On server side: a new cset is added based on rev 1 and rev 2 is rebased on newly added cset:
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   220
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   221
  $ hg up .^ -q
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   222
  $ echo d > d
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   223
  $ hg ci -Am "added d"
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   224
  adding d
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   225
  created new head
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   226
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   227
  $ hg rebase -r 2 -d .
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   228
  rebasing 2:155349b645be "added c"
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   229
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   230
  $ hg glog
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   231
  o  4:c0d7ee6604ea added c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   232
  |   draft
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   233
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   234
  @  3:c9241b0f2d5b added d
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   235
  |   draft
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   236
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   237
  o  1:5f6d8a4bf34a added b
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   238
  |   draft
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   239
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   240
  o  0:9092f1db7931 added a
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   241
      draft
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   242
  
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   243
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   244
On user side: user has not pulled yet and amended the rev 2 which created the divergence after pull:
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   245
  $ hg up 2 --hidden -q
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   246
  updated to hidden changeset 155349b645be
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   247
  (hidden revision '155349b645be' was rewritten as: c0d7ee6604ea)
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   248
  working directory parent is obsolete! (155349b645be)
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   249
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   250
  $ echo cc >> c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   251
  $ hg ci --amend -m "updated c"
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   252
  2 new content-divergent changesets
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   253
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   254
Lets change the phase to --public of branch which is pulled from server:
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   255
  $ hg phase --public -r 4
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   256
  $ hg glog -p
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   257
  @  5:f5f9b4fc8b77 updated c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   258
  |   draft content-divergent
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   259
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   260
  |  diff -r 5f6d8a4bf34a -r f5f9b4fc8b77 c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   261
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   262
  |  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   263
  |  @@ -0,0 +1,2 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   264
  |  +c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   265
  |  +cc
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   266
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   267
  | o  4:c0d7ee6604ea added c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   268
  | |   public
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   269
  | |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   270
  | |  diff -r c9241b0f2d5b -r c0d7ee6604ea c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   271
  | |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   272
  | |  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   273
  | |  @@ -0,0 +1,1 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   274
  | |  +c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   275
  | |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   276
  | o  3:c9241b0f2d5b added d
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   277
  |/    public
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   278
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   279
  |    diff -r 5f6d8a4bf34a -r c9241b0f2d5b d
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   280
  |    --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   281
  |    +++ b/d	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   282
  |    @@ -0,0 +1,1 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   283
  |    +d
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   284
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   285
  o  1:5f6d8a4bf34a added b
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   286
  |   public
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   287
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   288
  |  diff -r 9092f1db7931 -r 5f6d8a4bf34a b
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   289
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   290
  |  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   291
  |  @@ -0,0 +1,1 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   292
  |  +b
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   293
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   294
  o  0:9092f1db7931 added a
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   295
      public
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   296
  
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   297
     diff -r 000000000000 -r 9092f1db7931 a
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   298
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   299
     +++ b/a	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   300
     @@ -0,0 +1,1 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   301
     +a
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   302
  
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   303
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   304
Evolve:
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   305
  $ hg evolve --content-divergent
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   306
  merge:[4] added c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   307
  with: [5] updated c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   308
  base: [2] added c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   309
  rebasing "other" content-divergent changeset f5f9b4fc8b77 on c9241b0f2d5b
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   310
  updating to "local" side of the conflict: c0d7ee6604ea
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   311
  merging "other" content-divergent changeset 'c3d442d80993'
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   312
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   313
  committed as 3b336cbee992
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   314
  working directory is now at 3b336cbee992
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   315
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   316
  $ hg glog -p
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   317
  @  8:3b336cbee992 phase-divergent update to c0d7ee6604ea:
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   318
  |   draft
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   319
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   320
  |  diff -r c0d7ee6604ea -r 3b336cbee992 c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   321
  |  --- a/c	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   322
  |  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   323
  |  @@ -1,1 +1,2 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   324
  |   c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   325
  |  +cc
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   326
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   327
  o  4:c0d7ee6604ea added c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   328
  |   public
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   329
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   330
  |  diff -r c9241b0f2d5b -r c0d7ee6604ea c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   331
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   332
  |  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   333
  |  @@ -0,0 +1,1 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   334
  |  +c
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   335
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   336
  o  3:c9241b0f2d5b added d
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   337
  |   public
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   338
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   339
  |  diff -r 5f6d8a4bf34a -r c9241b0f2d5b d
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   340
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   341
  |  +++ b/d	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   342
  |  @@ -0,0 +1,1 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   343
  |  +d
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   344
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   345
  o  1:5f6d8a4bf34a added b
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   346
  |   public
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   347
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   348
  |  diff -r 9092f1db7931 -r 5f6d8a4bf34a b
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   349
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   350
  |  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   351
  |  @@ -0,0 +1,1 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   352
  |  +b
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   353
  |
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   354
  o  0:9092f1db7931 added a
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   355
      public
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   356
  
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   357
     diff -r 000000000000 -r 9092f1db7931 a
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   358
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   359
     +++ b/a	Thu Jan 01 00:00:00 1970 +0000
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   360
     @@ -0,0 +1,1 @@
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   361
     +a
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   362
  
4471
3caa4a459439 tests: use current instability names everywhere
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4454
diff changeset
   363
Check that we don't have any unstable cset now:
4385
34322fb3afca evolve: add test for the case where public divergence on difference parents
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4384
diff changeset
   364
  $ hg evolve -l
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   365
  $ cd ..
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   366
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   367
Testing the case when csets are on different parent and no conflict in relocation and merging:
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   368
----------------------------------------------------------------------------------------------
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   369
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   370
  $ hg init pubdiv2
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   371
  $ cd pubdiv2
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   372
  $ for ch in a b c d; do
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   373
  >   echo $ch > $ch;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   374
  >   hg ci -Aqm "added "$ch;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   375
  > done;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   376
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   377
  $ hg up .^
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   378
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   379
  $ echo dd > d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   380
  $ hg add d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   381
  $ hg ci -m "added d"
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   382
  created new head
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   383
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   384
  $ hg up 1
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   385
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   386
  $ echo dd > d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   387
  $ echo e > e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   388
  $ hg add d e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   389
  $ hg ci -m "added d e"
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   390
  created new head
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   391
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   392
  $ hg glog
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   393
  @  5:4291d72ee19a added d e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   394
  |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   395
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   396
  | o  4:93cd84bbdaca added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   397
  | |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   398
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   399
  | | o  3:9150fe93bec6 added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   400
  | |/    draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   401
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   402
  | o  2:155349b645be added c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   403
  |/    draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   404
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   405
  o  1:5f6d8a4bf34a added b
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   406
  |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   407
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   408
  o  0:9092f1db7931 added a
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   409
      draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   410
  
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   411
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   412
  $ hg prune 3 -s 5
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   413
  1 changesets pruned
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   414
  $ hg prune 3 -s 4 --hidden
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   415
  1 changesets pruned
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   416
  2 new content-divergent changesets
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   417
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   418
Change phase to public for one head:
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   419
  $ hg phase -r 4 --public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   420
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   421
  $ hg glog
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   422
  @  5:4291d72ee19a added d e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   423
  |   draft content-divergent
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   424
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   425
  | o  4:93cd84bbdaca added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   426
  | |   public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   427
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   428
  | o  2:155349b645be added c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   429
  |/    public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   430
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   431
  o  1:5f6d8a4bf34a added b
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   432
  |   public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   433
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   434
  o  0:9092f1db7931 added a
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   435
      public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   436
  
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   437
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   438
  $ hg evolve --content-divergent --any
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   439
  merge:[4] added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   440
  with: [5] added d e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   441
  base: [3] added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   442
  rebasing "other" content-divergent changeset 4291d72ee19a on 155349b645be
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   443
  updating to "local" side of the conflict: 93cd84bbdaca
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   444
  merging "other" content-divergent changeset 'f88581407163'
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   445
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   446
  committed as 4cbe48a0c3d9
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   447
  working directory is now at 4cbe48a0c3d9
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   448
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   449
  $ hg glog -l 1
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   450
  @  8:4cbe48a0c3d9 phase-divergent update to 93cd84bbdaca:
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   451
  |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   452
  ~
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   453
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   454
  $ hg evolve -l
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   455
  $ cd ..
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   456
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   457
Different parents, relocation conflict
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   458
--------------------------------------
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   459
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   460
Testing the case when csets are on different parent and conflict in relocation
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   461
but not in merging.
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   462
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   463
  $ hg init pubdiv3
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   464
  $ cd pubdiv3
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   465
  $ for ch in a b c d; do
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   466
  >   echo $ch > $ch;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   467
  >   hg ci -Aqm "added "$ch;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   468
  > done;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   469
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   470
  $ hg up .^^
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   471
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   472
  $ echo d > d
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   473
  $ echo cfoo > c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   474
  $ echo e > e
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   475
  $ hg add d c e
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   476
  $ hg ci -m "added d c e"
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   477
  created new head
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   478
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   479
  $ hg up 'desc("added c")'
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   480
  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   481
  $ echo dd > d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   482
  $ hg add d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   483
  $ hg ci -m "added d"
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   484
  created new head
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   485
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   486
  $ hg glog
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   487
  @  5:93cd84bbdaca added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   488
  |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   489
  |
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   490
  | o  4:f31bcc378766 added d c e
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   491
  | |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   492
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   493
  +---o  3:9150fe93bec6 added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   494
  | |     draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   495
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   496
  o |  2:155349b645be added c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   497
  |/    draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   498
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   499
  o  1:5f6d8a4bf34a added b
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   500
  |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   501
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   502
  o  0:9092f1db7931 added a
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   503
      draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   504
  
4473
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   505
  $ hg prune 'min(desc("re:added d$"))' -s 'max(desc("re:added d$"))'
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   506
  1 changesets pruned
4473
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   507
  $ hg prune 'min(desc("re:added d$"))' -s 'desc("added d c e")' --hidden
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   508
  1 changesets pruned
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   509
  2 new content-divergent changesets
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   510
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   511
Change phase to public for one head:
4473
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   512
  $ hg phase --public -r 'max(desc("re:added d$"))'
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   513
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   514
  $ hg glog
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   515
  @  5:93cd84bbdaca added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   516
  |   public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   517
  |
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   518
  | *  4:f31bcc378766 added d c e
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   519
  | |   draft content-divergent
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   520
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   521
  o |  2:155349b645be added c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   522
  |/    public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   523
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   524
  o  1:5f6d8a4bf34a added b
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   525
  |   public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   526
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   527
  o  0:9092f1db7931 added a
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   528
      public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   529
  
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   530
  $ hg evolve --content-divergent --any
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   531
  merge:[5] added d
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   532
  with: [4] added d c e
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   533
  base: [3] added d
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   534
  rebasing "other" content-divergent changeset f31bcc378766 on 155349b645be
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   535
  merging c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   536
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   537
  fix conflicts and see `hg help evolve.interrupted`
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   538
  [1]
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   539
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   540
  $ hg diff
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   541
  diff -r 155349b645be c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   542
  --- a/c	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   543
  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   544
  @@ -1,1 +1,5 @@
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   545
  +<<<<<<< destination: 155349b645be - test: added c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   546
   c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   547
  +=======
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   548
  +cfoo
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   549
  +>>>>>>> evolving:    f31bcc378766 - test: added d c e
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   550
  diff -r 155349b645be d
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   551
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   552
  +++ b/d	Thu Jan 01 00:00:00 1970 +0000
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   553
  @@ -0,0 +1,1 @@
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   554
  +d
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   555
  diff -r 155349b645be e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   556
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   557
  +++ b/e	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   558
  @@ -0,0 +1,1 @@
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   559
  +e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   560
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   561
  $ echo c > c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   562
  $ hg res -m
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   563
  (no more unresolved files)
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   564
  continue: hg evolve --continue
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   565
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   566
  $ hg evolve --continue
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   567
  evolving 4:f31bcc378766 "added d c e"
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   568
  updating to "local" side of the conflict: 93cd84bbdaca
4472
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   569
  merging "other" content-divergent changeset 'bd28d3e4a228'
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   570
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   571
  committed as 412dde898967
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   572
  working directory is now at 412dde898967
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   573
  $ hg export
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   574
  # HG changeset patch
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   575
  # User test
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   576
  # Date 0 0
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   577
  #      Thu Jan 01 00:00:00 1970 +0000
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   578
  # Node ID 412dde898967b50e7d334aefff778a9af46d29d1
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   579
  # Parent  93cd84bbdacaeb8f881c29a609dbdd30c38cbc57
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   580
  phase-divergent update to 93cd84bbdaca:
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   581
  
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   582
  added d c e
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   583
  
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   584
  diff -r 93cd84bbdaca -r 412dde898967 e
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   585
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   586
  +++ b/e	Thu Jan 01 00:00:00 1970 +0000
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   587
  @@ -0,0 +1,1 @@
5dbaabfe2c59 test: fix a phase divergence test case to actually not contains conflict
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4471
diff changeset
   588
  +e
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   589
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   590
  $ hg evolve -l
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   591
  $ cd ..
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   592
4418
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   593
Testing the case when merging leads to conflicts but relocation won't:
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   594
---------------------------------------------------------------------
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   595
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   596
  $ hg init pubdiv3.5
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   597
  $ cd pubdiv3.5
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   598
  $ for ch in a b c d; do
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   599
  >   echo $ch > $ch;
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   600
  >   hg ci -Aqm "added "$ch;
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   601
  > done;
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   602
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   603
  $ hg up .^^
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   604
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   605
  $ echo dconflict > d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   606
  $ hg add d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   607
  $ hg ci -m "added d"
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   608
  created new head
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   609
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   610
  $ hg up 2
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   611
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   612
  $ echo dd > d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   613
  $ hg add d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   614
  $ hg ci -m "added d"
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   615
  created new head
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   616
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   617
  $ hg glog
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   618
  @  5:93cd84bbdaca added d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   619
  |   draft
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   620
  |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   621
  | o  4:9411ad1fe615 added d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   622
  | |   draft
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   623
  | |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   624
  +---o  3:9150fe93bec6 added d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   625
  | |     draft
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   626
  | |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   627
  o |  2:155349b645be added c
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   628
  |/    draft
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   629
  |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   630
  o  1:5f6d8a4bf34a added b
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   631
  |   draft
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   632
  |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   633
  o  0:9092f1db7931 added a
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   634
      draft
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   635
  
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   636
  $ hg prune 3 -s 5
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   637
  1 changesets pruned
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   638
  $ hg prune 3 -s 4 --hidden
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   639
  1 changesets pruned
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   640
  2 new content-divergent changesets
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   641
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   642
Change phase to public for one head:
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   643
  $ hg phase --public -r 5
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   644
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   645
  $ hg glog
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   646
  @  5:93cd84bbdaca added d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   647
  |   public
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   648
  |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   649
  | *  4:9411ad1fe615 added d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   650
  | |   draft content-divergent
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   651
  | |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   652
  o |  2:155349b645be added c
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   653
  |/    public
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   654
  |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   655
  o  1:5f6d8a4bf34a added b
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   656
  |   public
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   657
  |
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   658
  o  0:9092f1db7931 added a
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   659
      public
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   660
  
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   661
  $ hg evolve --content-divergent --any
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   662
  merge:[5] added d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   663
  with: [4] added d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   664
  base: [3] added d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   665
  rebasing "other" content-divergent changeset 9411ad1fe615 on 155349b645be
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   666
  updating to "local" side of the conflict: 93cd84bbdaca
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   667
  merging "other" content-divergent changeset 'b5c690cdf1d5'
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   668
  merging d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   669
  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   670
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   671
  fix conflicts and see `hg help evolve.interrupted`
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   672
  [1]
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   673
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   674
  $ echo d > d
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   675
  $ hg res -m
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   676
  (no more unresolved files)
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   677
  continue: hg evolve --continue
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   678
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   679
  $ hg evolve --continue
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   680
  committed as 2a0f44767904
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   681
  working directory is now at 2a0f44767904
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   682
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   683
  $ hg evolve -l
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   684
  $ cd ..
0ec30a7d9e12 evolve: add a test in pubdiv where only merging leads to conflict
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4417
diff changeset
   685
4412
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   686
Testing the case when relocation and merging both leads to conflicts:
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   687
--------------------------------------------------------------------
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   688
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   689
  $ hg init pubdiv4
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   690
  $ cd pubdiv4
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   691
  $ for ch in a b c d; do
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   692
  >   echo $ch > $ch;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   693
  >   hg ci -Aqm "added "$ch;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   694
  > done;
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   695
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   696
  $ hg up .^^
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   697
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   698
  $ echo cfoo > c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   699
  $ echo e > e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   700
  $ echo dconflict > d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   701
  $ hg add c e d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   702
  $ hg ci -m "added c e"
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   703
  created new head
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   704
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   705
  $ hg up 2
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   706
  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   707
  $ echo dd > d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   708
  $ hg add d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   709
  $ hg ci -m "added d"
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   710
  created new head
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   711
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   712
  $ hg glog
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   713
  @  5:93cd84bbdaca added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   714
  |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   715
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   716
  | o  4:3c17c7afaf6e added c e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   717
  | |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   718
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   719
  +---o  3:9150fe93bec6 added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   720
  | |     draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   721
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   722
  o |  2:155349b645be added c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   723
  |/    draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   724
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   725
  o  1:5f6d8a4bf34a added b
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   726
  |   draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   727
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   728
  o  0:9092f1db7931 added a
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   729
      draft
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   730
  
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   731
  $ hg prune 3 -s 5
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   732
  1 changesets pruned
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   733
  $ hg prune 3 -s 4 --hidden
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   734
  1 changesets pruned
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   735
  2 new content-divergent changesets
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   736
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   737
Change phase to public for one head:
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   738
  $ hg phase --public -r 5
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   739
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   740
  $ hg glog
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   741
  @  5:93cd84bbdaca added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   742
  |   public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   743
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   744
  | *  4:3c17c7afaf6e added c e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   745
  | |   draft content-divergent
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   746
  | |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   747
  o |  2:155349b645be added c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   748
  |/    public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   749
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   750
  o  1:5f6d8a4bf34a added b
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   751
  |   public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   752
  |
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   753
  o  0:9092f1db7931 added a
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   754
      public
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   755
  
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   756
  $ hg evolve --content-divergent --any
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   757
  merge:[5] added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   758
  with: [4] added c e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   759
  base: [3] added d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   760
  rebasing "other" content-divergent changeset 3c17c7afaf6e on 155349b645be
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   761
  merging c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   762
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   763
  fix conflicts and see `hg help evolve.interrupted`
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   764
  [1]
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   765
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   766
  $ hg diff
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   767
  diff -r 155349b645be c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   768
  --- a/c	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   769
  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   770
  @@ -1,1 +1,5 @@
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   771
  +<<<<<<< destination: 155349b645be - test: added c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   772
   c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   773
  +=======
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   774
  +cfoo
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   775
  +>>>>>>> evolving:    3c17c7afaf6e - test: added c e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   776
  diff -r 155349b645be d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   777
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   778
  +++ b/d	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   779
  @@ -0,0 +1,1 @@
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   780
  +dconflict
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   781
  diff -r 155349b645be e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   782
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   783
  +++ b/e	Thu Jan 01 00:00:00 1970 +0000
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   784
  @@ -0,0 +1,1 @@
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   785
  +e
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   786
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   787
  $ echo cfoo > c
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   788
  $ hg res -m
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   789
  (no more unresolved files)
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   790
  continue: hg evolve --continue
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   791
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   792
  $ hg evolve --continue
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   793
  evolving 4:3c17c7afaf6e "added c e"
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   794
  updating to "local" side of the conflict: 93cd84bbdaca
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   795
  merging "other" content-divergent changeset 'c4ce3d34e784'
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   796
  merging d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   797
  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   798
  2 files updated, 0 files merged, 0 files removed, 1 files unresolved
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   799
  fix conflicts and see `hg help evolve.interrupted`
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   800
  [1]
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   801
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   802
  $ echo d > d
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   803
  $ hg res -m
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   804
  (no more unresolved files)
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   805
  continue: hg evolve --continue
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   806
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   807
  $ hg evolve --continue
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   808
  committed as b9082a9e66ce
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   809
  working directory is now at b9082a9e66ce
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   810
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   811
  $ hg evolve -l
dcbe64c954dc evolve: add tests of relocation case in public divergence
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4385
diff changeset
   812
  $ cd ..
4416
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
   813
4473
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   814
Different parent, simple conflict on relocate, deleted file on actual merge
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   815
---------------------------------------------------------------------------
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   816
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   817
Changeset "added c e" is also removing 'd'. This should conflict with the update
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   818
to 'd' in the successors of 'adding d' when solving the content divergence.
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   819
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   820
  $ hg init pubdiv-parent-deleted-file
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   821
  $ cd pubdiv-parent-deleted-file
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   822
  $ for ch in a b c d; do
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   823
  >   echo $ch > $ch;
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   824
  >   hg ci -Aqm "added "$ch;
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   825
  > done;
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   826
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   827
  $ hg up 'desc("added b")'
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   828
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   829
  $ echo cfoo > c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   830
  $ echo e > e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   831
  $ hg add c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   832
  $ hg ci -m "added c e"
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   833
  created new head
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   834
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   835
  $ hg up 'desc("re:added c$")'
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   836
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   837
  $ echo dd > d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   838
  $ hg add d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   839
  $ hg ci -m "added d"
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   840
  created new head
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   841
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   842
  $ hg glog --patch --rev 'sort(all(), "topo")'
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   843
  @  5:93cd84bbdaca added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   844
  |   draft
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   845
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   846
  |  diff -r 155349b645be -r 93cd84bbdaca d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   847
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   848
  |  +++ b/d	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   849
  |  @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   850
  |  +dd
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   851
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   852
  | o  3:9150fe93bec6 added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   853
  |/    draft
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   854
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   855
  |    diff -r 155349b645be -r 9150fe93bec6 d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   856
  |    --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   857
  |    +++ b/d	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   858
  |    @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   859
  |    +d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   860
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   861
  o  2:155349b645be added c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   862
  |   draft
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   863
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   864
  |  diff -r 5f6d8a4bf34a -r 155349b645be c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   865
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   866
  |  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   867
  |  @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   868
  |  +c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   869
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   870
  | o  4:e568fd1029bb added c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   871
  |/    draft
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   872
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   873
  |    diff -r 5f6d8a4bf34a -r e568fd1029bb c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   874
  |    --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   875
  |    +++ b/c	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   876
  |    @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   877
  |    +cfoo
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   878
  |    diff -r 5f6d8a4bf34a -r e568fd1029bb e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   879
  |    --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   880
  |    +++ b/e	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   881
  |    @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   882
  |    +e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   883
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   884
  o  1:5f6d8a4bf34a added b
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   885
  |   draft
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   886
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   887
  |  diff -r 9092f1db7931 -r 5f6d8a4bf34a b
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   888
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   889
  |  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   890
  |  @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   891
  |  +b
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   892
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   893
  o  0:9092f1db7931 added a
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   894
      draft
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   895
  
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   896
     diff -r 000000000000 -r 9092f1db7931 a
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   897
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   898
     +++ b/a	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   899
     @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   900
     +a
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   901
  
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   902
  $ hg prune 'min(desc("added d"))' -s 'max(desc("added d"))'
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   903
  1 changesets pruned
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   904
  $ hg prune 'min(desc("added d"))' -s 'desc("added c e")' --hidden
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   905
  1 changesets pruned
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   906
  2 new content-divergent changesets
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   907
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   908
Change phase to public for one head:
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   909
  $ hg phase --public -r 'max(desc("added d"))'
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   910
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   911
  $ hg glog
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   912
  @  5:93cd84bbdaca added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   913
  |   public
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   914
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   915
  | *  4:e568fd1029bb added c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   916
  | |   draft content-divergent
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   917
  | |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   918
  o |  2:155349b645be added c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   919
  |/    public
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   920
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   921
  o  1:5f6d8a4bf34a added b
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   922
  |   public
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   923
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   924
  o  0:9092f1db7931 added a
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   925
      public
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   926
  
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   927
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   928
  $ hg glog --patch --rev 'sort(all(), "topo")' --hidden
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   929
  @  5:93cd84bbdaca added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   930
  |   public
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   931
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   932
  |  diff -r 155349b645be -r 93cd84bbdaca d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   933
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   934
  |  +++ b/d	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   935
  |  @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   936
  |  +dd
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   937
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   938
  | x  3:9150fe93bec6 added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   939
  |/    draft
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   940
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   941
  |    diff -r 155349b645be -r 9150fe93bec6 d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   942
  |    --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   943
  |    +++ b/d	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   944
  |    @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   945
  |    +d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   946
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   947
  o  2:155349b645be added c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   948
  |   public
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   949
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   950
  |  diff -r 5f6d8a4bf34a -r 155349b645be c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   951
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   952
  |  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   953
  |  @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   954
  |  +c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   955
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   956
  | *  4:e568fd1029bb added c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   957
  |/    draft content-divergent
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   958
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   959
  |    diff -r 5f6d8a4bf34a -r e568fd1029bb c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   960
  |    --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   961
  |    +++ b/c	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   962
  |    @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   963
  |    +cfoo
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   964
  |    diff -r 5f6d8a4bf34a -r e568fd1029bb e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   965
  |    --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   966
  |    +++ b/e	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   967
  |    @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   968
  |    +e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   969
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   970
  o  1:5f6d8a4bf34a added b
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   971
  |   public
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   972
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   973
  |  diff -r 9092f1db7931 -r 5f6d8a4bf34a b
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   974
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   975
  |  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   976
  |  @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   977
  |  +b
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   978
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   979
  o  0:9092f1db7931 added a
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   980
      public
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   981
  
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   982
     diff -r 000000000000 -r 9092f1db7931 a
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   983
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   984
     +++ b/a	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   985
     @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   986
     +a
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   987
  
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   988
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   989
  $ hg obslog --all --rev tip --patch
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   990
  @  93cd84bbdaca (5) added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   991
  |
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   992
  | *  e568fd1029bb (4) added c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   993
  |/
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   994
  x  9150fe93bec6 (3) added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   995
       rewritten(content) as 93cd84bbdaca using prune by test (Thu Jan 01 00:00:00 1970 +0000)
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   996
         diff -r 9150fe93bec6 -r 93cd84bbdaca d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   997
         --- a/d	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   998
         +++ b/d	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
   999
         @@ -1,1 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1000
         -d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1001
         +dd
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1002
  
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1003
       rewritten(description, parent, content) as e568fd1029bb using prune by test (Thu Jan 01 00:00:00 1970 +0000)
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1004
         (No patch available, changesets rebased)
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1005
  
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1006
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1007
  $ hg evolve --content-divergent --any
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1008
  merge:[5] added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1009
  with: [4] added c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1010
  base: [3] added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1011
  rebasing "other" content-divergent changeset e568fd1029bb on 155349b645be
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1012
  merging c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1013
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1014
  fix conflicts and see `hg help evolve.interrupted`
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1015
  [1]
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1016
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1017
  $ hg diff
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1018
  diff -r 155349b645be c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1019
  --- a/c	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1020
  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1021
  @@ -1,1 +1,5 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1022
  +<<<<<<< destination: 155349b645be - test: added c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1023
   c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1024
  +=======
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1025
  +cfoo
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1026
  +>>>>>>> evolving:    e568fd1029bb - test: added c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1027
  diff -r 155349b645be e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1028
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1029
  +++ b/e	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1030
  @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1031
  +e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1032
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1033
  $ echo c > c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1034
  $ hg res -m
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1035
  (no more unresolved files)
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1036
  continue: hg evolve --continue
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1037
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1038
  $ hg evolve --continue
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1039
  evolving 4:e568fd1029bb "added c e"
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1040
  updating to "local" side of the conflict: 93cd84bbdaca
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1041
  merging "other" content-divergent changeset '2af3359250d3'
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1042
  file 'd' was deleted in other but was modified in local.
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1043
  What do you want to do?
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1044
  use (c)hanged version, (d)elete, or leave (u)nresolved? u
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1045
  1 files updated, 0 files merged, 0 files removed, 1 files unresolved
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1046
  fix conflicts and see `hg help evolve.interrupted`
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1047
  [1]
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1048
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1049
  $ hg sum
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1050
  parent: 5:93cd84bbdaca 
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1051
   added d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1052
  parent: 6:2af3359250d3 tip (content-divergent)
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1053
   added c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1054
  branch: default
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1055
  commit: 1 modified, 1 unknown, 1 unresolved (merge)
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1056
  update: (current)
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1057
  phases: 1 draft
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1058
  content-divergent: 1 changesets
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1059
  evolve: (evolve --continue)
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1060
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1061
  $ echo resolved > d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1062
  $ hg resolve -m d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1063
  (no more unresolved files)
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1064
  continue: hg evolve --continue
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1065
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1066
  $ hg evolve --continue
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1067
  committed as bc1f4610744c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1068
  working directory is now at bc1f4610744c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1069
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1070
  $ hg export
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1071
  # HG changeset patch
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1072
  # User test
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1073
  # Date 0 0
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1074
  #      Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1075
  # Node ID bc1f4610744c6aa0e851d3876a61bfff6243b31c
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1076
  # Parent  93cd84bbdacaeb8f881c29a609dbdd30c38cbc57
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1077
  phase-divergent update to 93cd84bbdaca:
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1078
  
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1079
  added c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1080
  
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1081
  diff -r 93cd84bbdaca -r bc1f4610744c d
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1082
  --- a/d	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1083
  +++ b/d	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1084
  @@ -1,1 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1085
  -dd
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1086
  +resolved
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1087
  diff -r 93cd84bbdaca -r bc1f4610744c e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1088
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1089
  +++ b/e	Thu Jan 01 00:00:00 1970 +0000
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1090
  @@ -0,0 +1,1 @@
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1091
  +e
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1092
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1093
  $ hg evolve -l
14437b18b024 evolve: fix divergence resolution when not merging a descendant
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4472
diff changeset
  1094
  $ cd ..
4416
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1095
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1096
Testing the case when "merging results in same as public cset" where:
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1097
both the csets are on same parent and no conflict in merging.
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1098
---------------------------------------------------------------------
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1099
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1100
Prepare the repo:
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1101
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1102
  $ hg init pubdiv5
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1103
  $ cd pubdiv5
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1104
  $ for ch in a b c; do
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1105
  >   echo $ch > $ch;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1106
  >   hg ci -Am "added "$ch;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1107
  > done;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1108
  adding a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1109
  adding b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1110
  adding c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1111
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1112
  $ hg up .^
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1113
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1114
  $ echo ch > ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1115
  $ hg add ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1116
  $ hg ci -m "added ch"
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1117
  created new head
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1118
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1119
  $ hg up .^
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1120
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1121
  $ echo ch > ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1122
  $ hg add ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1123
  $ hg ci -m "added c"
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1124
  created new head
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1125
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1126
  $ hg glog
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1127
  @  4:f7c1071f1e7c added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1128
  |   draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1129
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1130
  | o  3:90522bccf499 added ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1131
  |/    draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1132
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1133
  | o  2:155349b645be added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1134
  |/    draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1135
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1136
  o  1:5f6d8a4bf34a added b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1137
  |   draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1138
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1139
  o  0:9092f1db7931 added a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1140
      draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1141
  
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1142
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1143
  $ hg prune 2 -s 3
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1144
  1 changesets pruned
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1145
  $ hg prune 2 -s 4 --hidden
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1146
  1 changesets pruned
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1147
  2 new content-divergent changesets
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1148
  $ hg phase --public -r 4
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1149
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1150
  $ hg glog
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1151
  @  4:f7c1071f1e7c added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1152
  |   public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1153
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1154
  | *  3:90522bccf499 added ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1155
  |/    draft content-divergent
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1156
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1157
  o  1:5f6d8a4bf34a added b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1158
  |   public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1159
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1160
  o  0:9092f1db7931 added a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1161
      public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1162
  
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1163
  $ hg evolve --content-divergent --any
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1164
  merge:[4] added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1165
  with: [3] added ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1166
  base: [2] added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1167
  merging "other" content-divergent changeset '90522bccf499'
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1168
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4438
a6bdb02a1902 evolve: warn user if cset desc is being lost
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4418
diff changeset
  1169
  content-divergent changesets differ by descriptions only, discarding 90522bccf499
4416
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1170
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1171
  $ hg evolve -l
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1172
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1173
  $ hg par
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1174
  changeset:   4:f7c1071f1e7c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1175
  tag:         tip
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1176
  parent:      1:5f6d8a4bf34a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1177
  user:        test
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1178
  date:        Thu Jan 01 00:00:00 1970 +0000
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1179
  summary:     added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1180
  
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1181
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1182
Testing the case when "merging results in same as public cset" where:
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1183
both the csets are on different parent and no conflict in merging and relocation.
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1184
---------------------------------------------------------------------------------
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1185
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1186
Prepare the repo:
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1187
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1188
  $ cd ..
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1189
  $ hg init pubdiv6
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1190
  $ cd pubdiv6
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1191
  $ for ch in a b c d; do
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1192
  >   echo $ch > $ch;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1193
  >   hg ci -Am "added "$ch;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1194
  > done;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1195
  adding a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1196
  adding b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1197
  adding c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1198
  adding d
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1199
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1200
  $ hg up 1
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1201
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1202
  $ echo dh > dh
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1203
  $ hg add dh
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1204
  $ hg ci -m "added dh"
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1205
  created new head
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1206
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1207
  $ hg up 2
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1208
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1209
  $ echo dh > dh
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1210
  $ hg add dh
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1211
  $ hg ci -m "added d"
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1212
  created new head
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1213
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1214
  $ hg glog
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1215
  @  5:e800202333a4 added d
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1216
  |   draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1217
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1218
  | o  4:5acd58ef5066 added dh
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1219
  | |   draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1220
  | |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1221
  +---o  3:9150fe93bec6 added d
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1222
  | |     draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1223
  | |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1224
  o |  2:155349b645be added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1225
  |/    draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1226
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1227
  o  1:5f6d8a4bf34a added b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1228
  |   draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1229
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1230
  o  0:9092f1db7931 added a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1231
      draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1232
  
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1233
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1234
  $ hg prune 3 -s 4
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1235
  1 changesets pruned
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1236
  $ hg prune 3 -s 5 --hidden
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1237
  1 changesets pruned
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1238
  2 new content-divergent changesets
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1239
  $ hg phase --public -r 5
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1240
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1241
  $ hg glog
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1242
  @  5:e800202333a4 added d
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1243
  |   public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1244
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1245
  | *  4:5acd58ef5066 added dh
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1246
  | |   draft content-divergent
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1247
  | |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1248
  o |  2:155349b645be added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1249
  |/    public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1250
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1251
  o  1:5f6d8a4bf34a added b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1252
  |   public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1253
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1254
  o  0:9092f1db7931 added a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1255
      public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1256
  
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1257
  $ hg evolve --content-divergent --any
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1258
  merge:[5] added d
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1259
  with: [4] added dh
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1260
  base: [3] added d
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1261
  rebasing "other" content-divergent changeset 5acd58ef5066 on 155349b645be
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1262
  updating to "local" side of the conflict: e800202333a4
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1263
  merging "other" content-divergent changeset 'ae3429430ef1'
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1264
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4438
a6bdb02a1902 evolve: warn user if cset desc is being lost
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4418
diff changeset
  1265
  content-divergent changesets differ by descriptions only, discarding ae3429430ef1
4416
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1266
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1267
  $ hg evolve -l
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1268
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1269
  $ hg par
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1270
  changeset:   5:e800202333a4
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1271
  tag:         tip
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1272
  parent:      2:155349b645be
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1273
  user:        test
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1274
  date:        Thu Jan 01 00:00:00 1970 +0000
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1275
  summary:     added d
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1276
  
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1277
Testing the case when "merging results in same as public cset" where:
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1278
both the csets are on same parent and merging leads to conflict.
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1279
---------------------------------------------------------------------
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1280
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1281
Prepare the repo:
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1282
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1283
  $ cd ..
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1284
  $ hg init pubdiv7
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1285
  $ cd pubdiv7
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1286
  $ for ch in a b c; do
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1287
  >   echo $ch > $ch;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1288
  >   hg ci -Am "added "$ch;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1289
  > done;
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1290
  adding a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1291
  adding b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1292
  adding c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1293
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1294
  $ hg up .^
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1295
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1296
  $ echo chconflict > ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1297
  $ hg add ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1298
  $ hg ci -m "added ch"
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1299
  created new head
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1300
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1301
  $ hg up .^
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1302
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1303
  $ echo ch > ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1304
  $ hg add ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1305
  $ hg ci -m "added c"
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1306
  created new head
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1307
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1308
  $ hg glog
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1309
  @  4:f7c1071f1e7c added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1310
  |   draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1311
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1312
  | o  3:229da2719b19 added ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1313
  |/    draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1314
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1315
  | o  2:155349b645be added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1316
  |/    draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1317
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1318
  o  1:5f6d8a4bf34a added b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1319
  |   draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1320
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1321
  o  0:9092f1db7931 added a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1322
      draft
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1323
  
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1324
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1325
  $ hg prune 2 -s 3
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1326
  1 changesets pruned
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1327
  $ hg prune 2 -s 4 --hidden
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1328
  1 changesets pruned
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1329
  2 new content-divergent changesets
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1330
  $ hg phase --public -r 4
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1331
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1332
  $ hg glog
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1333
  @  4:f7c1071f1e7c added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1334
  |   public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1335
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1336
  | *  3:229da2719b19 added ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1337
  |/    draft content-divergent
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1338
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1339
  o  1:5f6d8a4bf34a added b
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1340
  |   public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1341
  |
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1342
  o  0:9092f1db7931 added a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1343
      public
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1344
  
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1345
  $ hg evolve --content-divergent --any
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1346
  merge:[4] added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1347
  with: [3] added ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1348
  base: [2] added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1349
  merging "other" content-divergent changeset '229da2719b19'
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1350
  merging ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1351
  warning: conflicts while merging ch! (edit, then use 'hg resolve --mark')
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1352
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1353
  fix conflicts and see `hg help evolve.interrupted`
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1354
  [1]
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1355
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1356
  $ hg diff
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1357
  diff -r f7c1071f1e7c ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1358
  --- a/ch	Thu Jan 01 00:00:00 1970 +0000
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1359
  +++ b/ch	Thu Jan 01 00:00:00 1970 +0000
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1360
  @@ -1,1 +1,5 @@
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1361
  +<<<<<<< local: f7c1071f1e7c - test: added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1362
   ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1363
  +=======
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1364
  +chconflict
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1365
  +>>>>>>> other: 229da2719b19 - test: added ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1366
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1367
  $ echo ch > ch
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1368
  $ hg res -m
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1369
  (no more unresolved files)
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1370
  continue: hg evolve --continue
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1371
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1372
  $ hg evolve --continue
4438
a6bdb02a1902 evolve: warn user if cset desc is being lost
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4418
diff changeset
  1373
  content-divergent changesets differ by descriptions only, discarding 229da2719b19
4417
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1374
  working directory is now at f7c1071f1e7c
4416
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1375
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1376
  $ hg evolve -l
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1377
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1378
  $ hg par
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1379
  changeset:   4:f7c1071f1e7c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1380
  tag:         tip
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1381
  parent:      1:5f6d8a4bf34a
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1382
  user:        test
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1383
  date:        Thu Jan 01 00:00:00 1970 +0000
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1384
  summary:     added c
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1385
  
4417
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1386
Testing the case when "merging results in same as public cset" where:
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1387
both the csets are on different parent and relocation leads to conflict but merging won't.
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1388
------------------------------------------------------------------------------------------
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1389
Prepare the repo:
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1390
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1391
  $ cd ..
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1392
  $ hg init pubdiv8
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1393
  $ cd pubdiv8
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1394
  $ for ch in a b c d; do
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1395
  >   echo $ch > $ch;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1396
  >   hg ci -Am "added "$ch;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1397
  > done;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1398
  adding a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1399
  adding b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1400
  adding c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1401
  adding d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1402
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1403
  $ hg up 1
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1404
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1405
  $ echo dh > dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1406
  $ echo cc > c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1407
  $ hg add dh c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1408
  $ hg ci -m "added dh"
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1409
  created new head
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1410
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1411
  $ hg up 2
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1412
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1413
  $ echo dh > dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1414
  $ hg add dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1415
  $ hg ci -m "added d"
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1416
  created new head
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1417
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1418
  $ hg glog
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1419
  @  5:e800202333a4 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1420
  |   draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1421
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1422
  | o  4:f89a8e2f86ac added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1423
  | |   draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1424
  | |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1425
  +---o  3:9150fe93bec6 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1426
  | |     draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1427
  | |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1428
  o |  2:155349b645be added c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1429
  |/    draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1430
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1431
  o  1:5f6d8a4bf34a added b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1432
  |   draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1433
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1434
  o  0:9092f1db7931 added a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1435
      draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1436
  
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1437
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1438
  $ hg prune 3 -s 4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1439
  1 changesets pruned
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1440
  $ hg prune 3 -s 5 --hidden
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1441
  1 changesets pruned
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1442
  2 new content-divergent changesets
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1443
  $ hg phase --public -r 5
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1444
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1445
  $ hg glog
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1446
  @  5:e800202333a4 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1447
  |   public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1448
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1449
  | *  4:f89a8e2f86ac added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1450
  | |   draft content-divergent
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1451
  | |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1452
  o |  2:155349b645be added c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1453
  |/    public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1454
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1455
  o  1:5f6d8a4bf34a added b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1456
  |   public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1457
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1458
  o  0:9092f1db7931 added a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1459
      public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1460
  
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1461
  $ hg evolve --content-divergent --any
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1462
  merge:[5] added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1463
  with: [4] added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1464
  base: [3] added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1465
  rebasing "other" content-divergent changeset f89a8e2f86ac on 155349b645be
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1466
  merging c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1467
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1468
  fix conflicts and see `hg help evolve.interrupted`
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1469
  [1]
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1470
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1471
  $ echo c > c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1472
  $ hg res -m
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1473
  (no more unresolved files)
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1474
  continue: hg evolve --continue
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1475
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1476
  $ hg evolve --continue
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1477
  evolving 4:f89a8e2f86ac "added dh"
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1478
  updating to "local" side of the conflict: e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1479
  merging "other" content-divergent changeset 'bc309da55b88'
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1480
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
4438
a6bdb02a1902 evolve: warn user if cset desc is being lost
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4418
diff changeset
  1481
  content-divergent changesets differ by descriptions only, discarding bc309da55b88
4417
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1482
  working directory is now at e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1483
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1484
  $ hg evolve -l
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1485
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1486
  $ hg par
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1487
  changeset:   5:e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1488
  tag:         tip
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1489
  parent:      2:155349b645be
4416
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1490
  user:        test
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1491
  date:        Thu Jan 01 00:00:00 1970 +0000
4417
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1492
  summary:     added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1493
  
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1494
Testing the case when "merging results in same as public cset" where:
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1495
both the csets are on different parent and merging leads to conflict but relocation won't.
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1496
------------------------------------------------------------------------------------------
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1497
Prepare the repo:
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1498
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1499
  $ cd ..
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1500
  $ hg init pubdiv9
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1501
  $ cd pubdiv9
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1502
  $ for ch in a b c d; do
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1503
  >   echo $ch > $ch;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1504
  >   hg ci -Am "added "$ch;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1505
  > done;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1506
  adding a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1507
  adding b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1508
  adding c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1509
  adding d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1510
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1511
  $ hg up 1
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1512
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1513
  $ echo dhconflict > dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1514
  $ hg add dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1515
  $ hg ci -m "added dh"
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1516
  created new head
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1517
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1518
  $ hg up 2
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1519
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1520
  $ echo dh > dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1521
  $ hg add dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1522
  $ hg ci -m "added d"
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1523
  created new head
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1524
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1525
  $ hg glog
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1526
  @  5:e800202333a4 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1527
  |   draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1528
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1529
  | o  4:db0b7bba0aae added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1530
  | |   draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1531
  | |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1532
  +---o  3:9150fe93bec6 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1533
  | |     draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1534
  | |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1535
  o |  2:155349b645be added c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1536
  |/    draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1537
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1538
  o  1:5f6d8a4bf34a added b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1539
  |   draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1540
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1541
  o  0:9092f1db7931 added a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1542
      draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1543
  
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1544
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1545
  $ hg prune 3 -s 4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1546
  1 changesets pruned
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1547
  $ hg prune 3 -s 5 --hidden
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1548
  1 changesets pruned
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1549
  2 new content-divergent changesets
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1550
  $ hg phase --public -r 5
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1551
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1552
  $ hg glog
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1553
  @  5:e800202333a4 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1554
  |   public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1555
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1556
  | *  4:db0b7bba0aae added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1557
  | |   draft content-divergent
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1558
  | |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1559
  o |  2:155349b645be added c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1560
  |/    public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1561
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1562
  o  1:5f6d8a4bf34a added b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1563
  |   public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1564
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1565
  o  0:9092f1db7931 added a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1566
      public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1567
  
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1568
  $ hg evolve --content-divergent --any
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1569
  merge:[5] added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1570
  with: [4] added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1571
  base: [3] added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1572
  rebasing "other" content-divergent changeset db0b7bba0aae on 155349b645be
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1573
  updating to "local" side of the conflict: e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1574
  merging "other" content-divergent changeset 'a5bbf2042450'
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1575
  merging dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1576
  warning: conflicts while merging dh! (edit, then use 'hg resolve --mark')
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1577
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1578
  fix conflicts and see `hg help evolve.interrupted`
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1579
  [1]
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1580
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1581
  $ echo dh > dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1582
  $ hg res -m
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1583
  (no more unresolved files)
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1584
  continue: hg evolve --continue
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1585
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1586
  $ hg evolve --continue
4438
a6bdb02a1902 evolve: warn user if cset desc is being lost
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4418
diff changeset
  1587
  content-divergent changesets differ by descriptions only, discarding a5bbf2042450
4417
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1588
  working directory is now at e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1589
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1590
  $ hg evolve -l
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1591
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1592
  $ hg par
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1593
  changeset:   5:e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1594
  tag:         tip
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1595
  parent:      2:155349b645be
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1596
  user:        test
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1597
  date:        Thu Jan 01 00:00:00 1970 +0000
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1598
  summary:     added d
4416
b2a8e67b0933 evolve: handle a case in pubic-div when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4413
diff changeset
  1599
  
4417
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1600
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1601
Testing the case when "merging results in same as public cset" where:
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1602
both the csets are on different parent and relocation and merging both leads to conflict:
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1603
-----------------------------------------------------------------------------------------
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1604
Prepare the repo:
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1605
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1606
  $ cd ..
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1607
  $ hg init pubdiv10
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1608
  $ cd pubdiv10
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1609
  $ for ch in a b c d; do
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1610
  >   echo $ch > $ch;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1611
  >   hg ci -Am "added "$ch;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1612
  > done;
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1613
  adding a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1614
  adding b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1615
  adding c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1616
  adding d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1617
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1618
  $ hg up 1
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1619
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1620
  $ echo dhconflict > dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1621
  $ echo cc > c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1622
  $ hg add dh c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1623
  $ hg ci -m "added dh"
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1624
  created new head
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1625
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1626
  $ hg up 2
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1627
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1628
  $ echo dh > dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1629
  $ hg add dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1630
  $ hg ci -m "added d"
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1631
  created new head
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1632
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1633
  $ hg glog
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1634
  @  5:e800202333a4 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1635
  |   draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1636
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1637
  | o  4:67b19bbd770f added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1638
  | |   draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1639
  | |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1640
  +---o  3:9150fe93bec6 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1641
  | |     draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1642
  | |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1643
  o |  2:155349b645be added c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1644
  |/    draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1645
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1646
  o  1:5f6d8a4bf34a added b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1647
  |   draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1648
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1649
  o  0:9092f1db7931 added a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1650
      draft
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1651
  
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1652
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1653
  $ hg prune 3 -s 4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1654
  1 changesets pruned
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1655
  $ hg prune 3 -s 5 --hidden
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1656
  1 changesets pruned
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1657
  2 new content-divergent changesets
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1658
  $ hg phase --public -r 5
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1659
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1660
  $ hg glog
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1661
  @  5:e800202333a4 added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1662
  |   public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1663
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1664
  | *  4:67b19bbd770f added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1665
  | |   draft content-divergent
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1666
  | |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1667
  o |  2:155349b645be added c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1668
  |/    public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1669
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1670
  o  1:5f6d8a4bf34a added b
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1671
  |   public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1672
  |
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1673
  o  0:9092f1db7931 added a
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1674
      public
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1675
  
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1676
  $ hg evolve --content-divergent --any
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1677
  merge:[5] added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1678
  with: [4] added dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1679
  base: [3] added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1680
  rebasing "other" content-divergent changeset 67b19bbd770f on 155349b645be
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1681
  merging c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1682
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1683
  fix conflicts and see `hg help evolve.interrupted`
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1684
  [1]
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1685
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1686
  $ echo c > c
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1687
  $ hg res -m
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1688
  (no more unresolved files)
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1689
  continue: hg evolve --continue
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1690
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1691
  $ hg evolve --continue
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1692
  evolving 4:67b19bbd770f "added dh"
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1693
  updating to "local" side of the conflict: e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1694
  merging "other" content-divergent changeset '09054d1f3c97'
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1695
  merging dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1696
  warning: conflicts while merging dh! (edit, then use 'hg resolve --mark')
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1697
  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1698
  fix conflicts and see `hg help evolve.interrupted`
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1699
  [1]
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1700
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1701
  $ echo dh > dh
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1702
  $ hg res -m
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1703
  (no more unresolved files)
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1704
  continue: hg evolve --continue
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1705
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1706
  $ hg evolve --continue
4438
a6bdb02a1902 evolve: warn user if cset desc is being lost
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4418
diff changeset
  1707
  content-divergent changesets differ by descriptions only, discarding 09054d1f3c97
4417
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1708
  working directory is now at e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1709
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1710
  $ hg evolve -l
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1711
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1712
  $ hg par
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1713
  changeset:   5:e800202333a4
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1714
  tag:         tip
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1715
  parent:      2:155349b645be
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1716
  user:        test
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1717
  date:        Thu Jan 01 00:00:00 1970 +0000
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1718
  summary:     added d
b86413cfca4a evolve: cover continue case in pubdiv when merging results in same as public
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 4416
diff changeset
  1719
  
4444
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1720
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1721
  $ cd ..
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1722
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1723
Test a pratical "rebase" case
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1724
=============================
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1725
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1726
Initial setup
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1727
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1728
  $ hg init rebase-divergence
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1729
  $ cd rebase-divergence
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1730
  $ echo root >> root
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1731
  $ hg add root
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1732
  $ hg commit -m root
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1733
  $ for x in c_A c_B c_C c_D; do
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1734
  >     echo $x >> $x
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1735
  >     hg add $x
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1736
  >     hg commit -m $x
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1737
  > done
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1738
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1739
  $ hg up 'desc("c_A")'
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1740
  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1741
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1742
  $ for x in c_E c_F; do
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1743
  >     echo $x >> $x
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1744
  >     hg add $x
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1745
  >     hg commit -m $x
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1746
  > done
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1747
  created new head
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1748
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1749
(creating divergence locally for simplicity)
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1750
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1751
  $ node=`hg log --rev 'desc("c_E")' -T '{node}'`
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1752
  $ hg rebase -s $node -d 'desc("c_B")'
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1753
  rebasing 5:4ab2719bbab9 "c_E"
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1754
  rebasing 6:77ccbf8d837e "c_F" (tip)
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1755
  $ hg phase --public tip
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1756
  $ hg rebase --hidden -s $node -d 'desc("c_C")' --config experimental.evolution.allowdivergence=yes
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1757
  rebasing 5:4ab2719bbab9 "c_E"
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1758
  rebasing 6:77ccbf8d837e "c_F"
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1759
  2 new content-divergent changesets
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1760
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1761
  $ hg sum
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1762
  parent: 8:a52ac76b45f5 
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1763
   c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1764
  branch: default
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1765
  commit: (clean)
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1766
  update: 4 new changesets, 3 branch heads (merge)
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1767
  phases: 4 draft
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1768
  content-divergent: 2 changesets
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1769
  $ hg evolve --list
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1770
  b4a584aea4bd: c_E
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1771
    content-divergent: c7d2d47c7240 (public) (precursor 4ab2719bbab9)
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1772
  
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1773
  8ae8db670b4a: c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1774
    content-divergent: a52ac76b45f5 (public) (precursor 77ccbf8d837e)
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1775
  
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1776
  $ hg log -G --patch
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1777
  *  changeset:   10:8ae8db670b4a
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1778
  |  tag:         tip
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1779
  |  user:        test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1780
  |  date:        Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1781
  |  instability: content-divergent
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1782
  |  summary:     c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1783
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1784
  |  diff -r b4a584aea4bd -r 8ae8db670b4a c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1785
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1786
  |  +++ b/c_F	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1787
  |  @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1788
  |  +c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1789
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1790
  *  changeset:   9:b4a584aea4bd
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1791
  |  parent:      3:abb77b893f28
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1792
  |  user:        test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1793
  |  date:        Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1794
  |  instability: content-divergent
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1795
  |  summary:     c_E
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1796
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1797
  |  diff -r abb77b893f28 -r b4a584aea4bd c_E
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1798
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1799
  |  +++ b/c_E	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1800
  |  @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1801
  |  +c_E
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1802
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1803
  | @  changeset:   8:a52ac76b45f5
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1804
  | |  user:        test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1805
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1806
  | |  summary:     c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1807
  | |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1808
  | |  diff -r c7d2d47c7240 -r a52ac76b45f5 c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1809
  | |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1810
  | |  +++ b/c_F	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1811
  | |  @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1812
  | |  +c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1813
  | |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1814
  | o  changeset:   7:c7d2d47c7240
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1815
  | |  parent:      2:eb1b4e1205b8
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1816
  | |  user:        test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1817
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1818
  | |  summary:     c_E
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1819
  | |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1820
  | |  diff -r eb1b4e1205b8 -r c7d2d47c7240 c_E
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1821
  | |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1822
  | |  +++ b/c_E	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1823
  | |  @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1824
  | |  +c_E
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1825
  | |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1826
  +---o  changeset:   4:dbb960d6c97c
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1827
  | |    user:        test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1828
  | |    date:        Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1829
  | |    summary:     c_D
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1830
  | |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1831
  | |    diff -r abb77b893f28 -r dbb960d6c97c c_D
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1832
  | |    --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1833
  | |    +++ b/c_D	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1834
  | |    @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1835
  | |    +c_D
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1836
  | |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1837
  o |  changeset:   3:abb77b893f28
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1838
  |/   user:        test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1839
  |    date:        Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1840
  |    summary:     c_C
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1841
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1842
  |    diff -r eb1b4e1205b8 -r abb77b893f28 c_C
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1843
  |    --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1844
  |    +++ b/c_C	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1845
  |    @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1846
  |    +c_C
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1847
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1848
  o  changeset:   2:eb1b4e1205b8
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1849
  |  user:        test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1850
  |  date:        Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1851
  |  summary:     c_B
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1852
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1853
  |  diff -r e31751786014 -r eb1b4e1205b8 c_B
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1854
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1855
  |  +++ b/c_B	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1856
  |  @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1857
  |  +c_B
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1858
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1859
  o  changeset:   1:e31751786014
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1860
  |  user:        test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1861
  |  date:        Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1862
  |  summary:     c_A
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1863
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1864
  |  diff -r 1e4be0697311 -r e31751786014 c_A
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1865
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1866
  |  +++ b/c_A	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1867
  |  @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1868
  |  +c_A
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1869
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1870
  o  changeset:   0:1e4be0697311
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1871
     user:        test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1872
     date:        Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1873
     summary:     root
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1874
  
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1875
     diff -r 000000000000 -r 1e4be0697311 root
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1876
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1877
     +++ b/root	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1878
     @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1879
     +root
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1880
  
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1881
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1882
Run automatic evolution
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1883
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1884
  $ hg evolve --content-divergent --rev 'not public() and desc("c_E")::'
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1885
  merge:[7] c_E
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1886
  with: [9] c_E
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1887
  base: [5] c_E
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1888
  rebasing "other" content-divergent changeset b4a584aea4bd on eb1b4e1205b8
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1889
  updating to "local" side of the conflict: c7d2d47c7240
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1890
  merging "other" content-divergent changeset '0773642cfa95'
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1891
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1892
  1 new orphan changesets
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1893
  merge:[8] c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1894
  with: [10] c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1895
  base: [6] c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1896
  rebasing "other" content-divergent changeset 8ae8db670b4a on c7d2d47c7240
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1897
  updating to "local" side of the conflict: a52ac76b45f5
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1898
  merging "other" content-divergent changeset '6a87ed4aa317'
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1899
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1900
  $ hg sum
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1901
  parent: 8:a52ac76b45f5 tip
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1902
   c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1903
  branch: default
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1904
  commit: (clean)
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1905
  update: 2 new changesets, 2 branch heads (merge)
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1906
  phases: 2 draft
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1907
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1908
  $ hg evolve --list
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1909
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1910
  $ hg log -G --patch
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1911
  @  changeset:   8:a52ac76b45f5
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1912
  |  tag:         tip
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1913
  |  user:        test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1914
  |  date:        Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1915
  |  summary:     c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1916
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1917
  |  diff -r c7d2d47c7240 -r a52ac76b45f5 c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1918
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1919
  |  +++ b/c_F	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1920
  |  @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1921
  |  +c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1922
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1923
  o  changeset:   7:c7d2d47c7240
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1924
  |  parent:      2:eb1b4e1205b8
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1925
  |  user:        test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1926
  |  date:        Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1927
  |  summary:     c_E
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1928
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1929
  |  diff -r eb1b4e1205b8 -r c7d2d47c7240 c_E
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1930
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1931
  |  +++ b/c_E	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1932
  |  @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1933
  |  +c_E
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1934
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1935
  | o  changeset:   4:dbb960d6c97c
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1936
  | |  user:        test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1937
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1938
  | |  summary:     c_D
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1939
  | |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1940
  | |  diff -r abb77b893f28 -r dbb960d6c97c c_D
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1941
  | |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1942
  | |  +++ b/c_D	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1943
  | |  @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1944
  | |  +c_D
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1945
  | |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1946
  | o  changeset:   3:abb77b893f28
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1947
  |/   user:        test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1948
  |    date:        Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1949
  |    summary:     c_C
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1950
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1951
  |    diff -r eb1b4e1205b8 -r abb77b893f28 c_C
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1952
  |    --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1953
  |    +++ b/c_C	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1954
  |    @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1955
  |    +c_C
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1956
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1957
  o  changeset:   2:eb1b4e1205b8
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1958
  |  user:        test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1959
  |  date:        Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1960
  |  summary:     c_B
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1961
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1962
  |  diff -r e31751786014 -r eb1b4e1205b8 c_B
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1963
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1964
  |  +++ b/c_B	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1965
  |  @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1966
  |  +c_B
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1967
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1968
  o  changeset:   1:e31751786014
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1969
  |  user:        test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1970
  |  date:        Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1971
  |  summary:     c_A
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1972
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1973
  |  diff -r 1e4be0697311 -r e31751786014 c_A
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1974
  |  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1975
  |  +++ b/c_A	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1976
  |  @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1977
  |  +c_A
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1978
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1979
  o  changeset:   0:1e4be0697311
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1980
     user:        test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1981
     date:        Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1982
     summary:     root
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1983
  
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1984
     diff -r 000000000000 -r 1e4be0697311 root
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1985
     --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1986
     +++ b/root	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1987
     @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1988
     +root
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1989
  
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1990
  $ hg export tip
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1991
  # HG changeset patch
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1992
  # User test
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1993
  # Date 0 0
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1994
  #      Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1995
  # Node ID a52ac76b45f523a039fc4a938d79874f4bdb1a85
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1996
  # Parent  c7d2d47c7240562be5cbd1a24080dd0396178709
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1997
  c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1998
  
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  1999
  diff -r c7d2d47c7240 -r a52ac76b45f5 c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2000
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2001
  +++ b/c_F	Thu Jan 01 00:00:00 1970 +0000
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2002
  @@ -0,0 +1,1 @@
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2003
  +c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2004
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2005
  $ hg obslog --rev a52ac76b45f5
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2006
  @    a52ac76b45f5 (8) c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2007
  |\
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2008
  x |  6a87ed4aa317 (12) c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2009
  | |    rewritten as a52ac76b45f5 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2010
  | |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2011
  x |  8ae8db670b4a (10) c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2012
  |/     rewritten(parent) as 6a87ed4aa317 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2013
  |
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2014
  x  77ccbf8d837e (6) c_F
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2015
       rewritten(parent) as 8ae8db670b4a using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2016
       rewritten(parent) as a52ac76b45f5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
ea336a6592cc evolve: test a common case of public divergence
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4438
diff changeset
  2017