Mercurial User Group

Reply
This is an open group. Sign in and click the "Join Group" button to become a group member and start posting.

Feedback

Post your feedback and questions here.

Andreas S
Systems Engineer
0 Kudos
Message 1 of 8
(5,730 Views)
7 REPLIES

Feedback

Hello Andreas,

what is the functionality of this integration?

Is it an integration in the  LabVIEW IDE? or in the Mercurial workflow.

I could add the code that I have for the integration into the LabVIEW IDE into this project.

Ton

Free Code Capture Tool! Version 2.1.3 with comments, web-upload, back-save and snippets!
Nederlandse LabVIEW user groep www.lvug.nl
My LabVIEW Ideas

LabVIEW, programming like it should be!
0 Kudos
Message 2 of 8
(3,242 Views)

Feedback

This code just creates an exe wrapper fro LVCompare so it can diff 2 files coming from mercurial. The installer also sets mercurial.ini keys so that LV files are diffed and merged by default using the wrapper and LVMerge. There is no integration into the IDE.

If you have an integration it would be great to post it here and create a bitbucked open source project or similar.

Andreas

Andreas S
Systems Engineer
0 Kudos
Message 3 of 8
(3,242 Views)

Feedback

Hello

Nice Tool

Small Problem whenn other files are diffed then will allways start LVDiff

Please add to  mercurial.ini the follofing parameter the number of the prority can be changed.

LVMerge.priority=-9

lvdiff.priority=-9

Best reagards

Tobias Gugger

0 Kudos
Message 4 of 8
(3,242 Views)

Re: Feedback

I tried cloning the repository using "hg clone https://bitbucket.org/AndreasS/mercurial-labview-integration".  Mercurial cannot find a repository there.

Capture.PNG

Any ideas?

0 Kudos
Message 5 of 8
(3,242 Views)

Re: Feedback

Meh... that dialog box is from SourceTree, which doesn't support Mercurial yet.  However, trying to clone from the command line still results in a "repository not found" error.

0 Kudos
Message 6 of 8
(3,242 Views)
Highlighted

Re: Feedback

The command should be hg clone https://bitbucket.org/AndreasS/mercurial-labview-integration

Works for me:

Microsoft Windows [Version 6.1.7601]

Copyright (c) 2009 Microsoft Corporation.  All rights reserved.

d:\temp>hg clone https://bitbucket.org/AndreasS/mercurial-labview-integration

destination directory: mercurial-labview-integration

requesting all changes

adding changesets

adding manifests

adding file changes

added 20 changesets with 69 changes to 18 files

updating to branch default

17 files updated, 0 files merged, 0 files removed, 0 files unresolved

d:\temp>

Free Code Capture Tool! Version 2.1.3 with comments, web-upload, back-save and snippets!
Nederlandse LabVIEW user groep www.lvug.nl
My LabVIEW Ideas

LabVIEW, programming like it should be!
0 Kudos
Message 7 of 8
(3,242 Views)

Re: Feedback

Hmm, this time it worked for me.  Thanks for checking it for me.

0 Kudos
Message 8 of 8
(3,242 Views)
Reply
This is an open group. Sign in and click the "Join Group" button to become a group member and start posting.