Skip to content
Snippets Groups Projects

Topic/stable/test obsolete fix

Merged Raphaël Gomès requested to merge topic/stable/test-obsolete-fix into branch/stable
3 unresolved threads

Merge request reports

Checking pipeline status.

Approval is optional

Merged by Raphaël GomèsRaphaël Gomès 4 years ago (Jul 23, 2020 8:45pm UTC)

Merge details

  • Changes merged into branch/stable with d55e83fa.
  • Deleted the source branch.

Pipeline #37493 passed

Pipeline passed for d55e83fa on branch/stable

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
1 ===============================================
  • This file should probably be called evolve-wdir given what it test.

    I wonder if this is the right direction. Since the varienty of case is going to close to the one we have for normal changeset. Maybe we just need to test wdir stabilisation at the same location as we test normal changeset ?

    Int he case we are interrested in it would mean moving the test in some divegrence related test (if we don't already have an equivalent).

    By Pierre-Yves David on 2020-07-23T18:39:22 (imported from GitLab)

  • Replying to myself…

    The only instability that can affect wdir is orphaness, since the two divergences flavor does not apply. so it seems fine to have a test-evolve-orphan-wdir test file.

    By Pierre-Yves David on 2020-07-23T18:42:13 (imported from GitLab)

  • changed this line in version 2 of the diff

    By Sushil Khanchi on 2020-07-23T19:05:19 (imported from GitLab)

  • My intention of adding all these cases at same place: I was thinking to improve the behavior for rest two cases, specially for split case since I see some space there. For now, we just give an error and do nothing but but we can definitely update to maximum of all the split csets if they went on a linear line.

    By Sushil Khanchi on 2020-07-23T19:10:04 (imported from GitLab)

  • My point is that we are going to get all the combination we tend to get for the other case (eg: is the split linear, which one is the top most, etc).

    However I think the amount of case will be quite limited since we are talking about orphan only here. So lets keep this file :-)

    By Pierre-Yves David on 2020-07-23T20:41:14 (imported from GitLab)

  • Please register or sign in to reply
  • Raphaël Gomès
    Raphaël Gomès @raphael.gomes started a thread on an outdated change in commit 01a331dc
  • 1 ===============================================
    2 Testing evolution of obsolete working directory
    3 ===============================================
    4
    5 Pulling changes from other repos can make your working directory parent (wdp)
  • Raphaël Gomès assigned to @khanchi97 and unassigned @marmoute

    assigned to @khanchi97 and unassigned @marmoute

    By Pierre-Yves David on 2020-07-23T18:43:57 (imported from GitLab)

  • Raphaël Gomès added 2 commits

    added 2 commits

    • 272094174185 - test-obsolete: move a divergence related test from the main test
    • d55e83faeaf8 - test-obsolete: remove divergence casually introduced by rebase

    Compare with previous version

    By Sushil Khanchi on 2020-07-23T19:05:20 (imported from GitLab)

  • Raphaël Gomès assigned to @marmoute and unassigned @khanchi97

    assigned to @marmoute and unassigned @khanchi97

    By Sushil Khanchi on 2020-07-23T19:12:17 (imported from GitLab)

  • merged

    By Mercurial-scm.org Synchronisation on 2020-07-23T20:45:22 (imported from GitLab)

  • Please register or sign in to reply
    Loading