(Please don't remove the list address.) On Thu, 14 Sep 2017 11:17:45 +0530, utsavi bharuchwala wrote: > By learning tortoisehg features below is what I understand. > > Step-1 commit to new branch > Branch: Experment6 > FileName-Content: Experiment5.c - stringcpy() //added a new file > having one function available > Experiment6.c - stringcata() > > step-2 update default branch > > step-3 commit to default branch > Branch: default > FileName-Content: Experiment5.c - stringcpy() + strcompare() //added > a new file having both functions available > Experiment6.c - stringcata() + stringtrunc() > step-4 right click on Experment6 branch and press 'Merge with local..' > Conflict is generated in this case and by solving it merging done > successfully. > > result: > branch: default(after merge with experiment6) > File content: of branch default > > There is no meaning of this merging. since default branch is containing all > the functions and I am merging it with experiment6 branch which is subset > of default branch...!! Final result is same as default branch...No > difference in default branch...!! unnecessary conflict according to me...!! > > Now in the reverse case: (Real case where, Experiment7 is developing branch > and I want to submit(merge) whatever I have done in this, to default branch > ) > > Step-1 (see image Workbench Repositiory.png) > Branch: Experment7 > FileName-Content: Experiment7.c - add() + deduct() //added a new > file having both functions available > Experiment8.c - mul() + division() > > step-2 update default branch > step-3 commit to default branch > Branch: default > FileName-Content: Experiment7.c - add() //added a new file having > one function available > Experiment8.c - mul() > step-4 right click on Experment7 branch and press 'Merge with local..' (see > image of Select Merge with local.png and Merge Popup.png) > Conflict is not generated in this case...!! Strange.. > > (see image of merge conflict not generated.png)
Yeah, strange. These changes should conflict as long as they differ. > result: > branch: default(after merge with experiment7) > File content: of branch default > > why this is so..???Merge conflict should be generated in this case also. > > Moral of the story: After merging any branch with default branch, it > contains the code of default branch only regardless of merging....!!! > > Is all above steps are correct? Seems correct. Can you test the following commands? - "hg config merge-patters" to make sure no merge rules are set - "hg merge --tool :fail --debug 19" (i.e. run the merge with --debug option) Also, it would be nice if you can prepare a public repo in which the problem can be reproduced. The file contents shouldn't matter. > You asked me which function I am using for merge. I am merging just by > right click on branch name. Is there any function should I need to use for > this? Please suggest. > > Settings in tortoisehg image is included. Please see the images attached > below.And please help me to sort this out. ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
