comparison tests/test-evolve-content-divergent-case-A3.t @ 5572:d7d954b6d518

evolve: remove swapping nodes logic while resolving divergence

Before this patch, while solving content-divergence if one of the
divergent cset need to relocate to resolution parent we used to set that
cset to "other" side; so it was like we are always going to relocate "other"
side which made us to swap the two if "divergent" cset need to relocate.

Above mentioned solution for relocating cset was not good and led us to incorrect
output in some cases.

So this patch, simplify the logic and remove the swapping thing and clearly depend
on resolution parent to check if any of the divergent cset needs to relocate.
This also means that now in some cases if both the divergent csets needs
to relocate, both will be relocated. Even before this patch, there are some cases
where both the divergent csets relocated but not in every case where it should
have.

Coming to the changes in test files:
1) changes in order of merging the two divergent csets is due to fact that
   now "divergent" and "other" are not swapped and hence "divergent" will be at
   local side and "other" will be at "other", which also results in change in
   the hash id for some cases.

2) extra changesets: which is the result of the fact that now we don't miss
   any case where both the divergent csets should be based on resolution parent
   before performing the merge -> which caught some cases and performed relocation,
   hence extra changesets. Although you can find that there is no changes in file
   content because of these relocation, but I remember loosing some data because
   of not relocating the "divergent", so why leave any risk out there by not
   relocating "other" to the resolution parent.

5571:b2de5825e5ca

  o  1:f5bc6836db60 (draft): A
  |
  o  0:a9bdc8b26820 (public): O
  
  $ hg evolve --content-divergent
  merge:[5] C
  with: [4] C
  base: [3] C
  rebasing "other" content-divergent changeset 710d96992b40 on f6fbb35d8ac9
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  working directory is now at 3ad062d48137

  $ hg log -G
  @  7:3ad062d48137 (draft): C
  |
  o  2:f6fbb35d8ac9 (draft): B
  |
  o  1:f5bc6836db60 (draft): A
  |
  o  0:a9bdc8b26820 (public): O
  
  $ hg evolve -l

  $ hg log -pl1
  7:3ad062d48137 (draft): C 
  diff -r f6fbb35d8ac9 -r 3ad062d48137 C
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  +++ b/C	Thu Jan 01 00:00:00 1970 +0000
  @@ -0,0 +1,1 @@
  +newC
  

5572:d7d954b6d518

  o  1:f5bc6836db60 (draft): A
  |
  o  0:a9bdc8b26820 (public): O
  
  $ hg evolve --content-divergent
  merge:[4] C
  with: [5] C
  base: [3] C
  rebasing "divergent" content-divergent changeset 710d96992b40 on f6fbb35d8ac9
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  working directory is now at 8f91b97f6f9a

  $ hg log -G
  @  7:8f91b97f6f9a (draft): C
  |
  o  2:f6fbb35d8ac9 (draft): B
  |
  o  1:f5bc6836db60 (draft): A
  |
  o  0:a9bdc8b26820 (public): O
  
  $ hg evolve -l

  $ hg log -pl1
  7:8f91b97f6f9a (draft): C 
  diff -r f6fbb35d8ac9 -r 8f91b97f6f9a C
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
  +++ b/C	Thu Jan 01 00:00:00 1970 +0000
  @@ -0,0 +1,1 @@
  +newC