Jump to content

Search the Community

Showing results for tags 'hg'.

  • Search By Tags

    Type tags separated by commas.
  • Search By Author

Content Type


Forums

  • Plastic SCM
    • General
    • Installation and configuration
    • Unity 3D
    • Plastic SCM on Mac
    • Plastic SCM on Linux
    • Gluon
    • Git interop
    • Integrations
    • Community Edition
    • Branching and merging
    • Announcements
  • Plastic SCM 4.0 Beta (Closed)
  • Plastic Cloud
    • General
    • Configuration
  • SemanticMerge
    • General
    • License
    • SCM's configuration
    • Share your experience!
    • External Parsers
  • GitJungle
  • Method History for Subversion

Find results in...

Find results that contain...


Date Created

  • Start

    End


Last Updated

  • Start

    End


Filter by number of...

Joined

  • Start

    End


Group


AIM


MSN


Website URL


ICQ


Yahoo


Jabber


Skype


Location


Interests

Found 3 results

  1. Hi Plastic Community, I'm new to PlasticSCM, but well-versed in other DVCS tools (e.g., Git, Mercurial, Bazaar). One of the features I really like in those tools is an ability -- indeed an active choice -- to ignore the network unless absolutely necessary. From simple actions, like making a commit and creating a branch, to slightly more esoteric actions like viewing the log or generating arbitrary patches, the DVCS tools to which I'm accustomed do not require network access unless actively sharing code (pushing or pulling). This has huge benefits in terms of speed, but more importantly,
  2. I have set up mercurial to use SemanticMerge for my diff and merge tool as per the instructions here: http://www.semanticmerge.com/documents/SemanticMerge-Mercurial.pdf . I can merge files ok but if I try and "diff to parent" for a class (from TortoiseHg workbench) a SemanticMerge menu appears displaying merge and diff options. Using Process Explorer shows that no arguments were passed to SemanticMerge when it started. I have consulted the documentation for extdiff here http://mercurial.selenic.com/wiki/ExtdiffExtension and I cannot see how SemanticMerge should be setup in the mercuria
  3. Hello there I've followed the instructions in the below document but I can't merge with Semantic Merge via Tortoise hg GUI. The instructions doesn't seem correct. It works via command line though. Any input for me? http://www.semanticmerge.com/documents/SemanticMerge-Mercurial.pdf Best regards
×
×
  • Create New...