Uploaded image for project: 'NetBeans'
  1. NetBeans
  2. NETBEANS-494

Modifiying same line in a clone does not create a conflict

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Open
    • Minor
    • Resolution: Unresolved
    • None
    • None
    • versioncontrol - Mercurial
    • None

    Description

      This issue was found as part of NetCAT 9.0 testing.

      Following instructions at step 2.11 of the Mercurial Test Spec at http://netbeans-vm.apache.org/synergy/client/app/#/title/%255Bvcs%255D_mercurial_support_test_specification_for_netbeans_7.4/

      Instructions imply modifying the same line on a cloned repo, then pusing back to the original repo should create a conflict, but it doesn't. File in the original repository is updated with changes in the cloned repository after a push.

      Attachments

        Activity

          People

            Unassigned Unassigned
            dheffelfinger David Heffelfinger
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated: