David R. Heffelfinger created NETBEANS-494:
----------------------------------------------
Summary: Modifiying same line in a clone does not create a conflict
Key: NETBEANS-494
URL: https://issues.apache.org/jira/browse/NETBEANS-494
Project: NetBeans
Issue Type: Bug
Components: versioncontrol - Mercurial
Reporter: David R. Heffelfinger
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/|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.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
