Search found 5 matches

by Cosmic Prune
Thu Jan 03, 2008 8:52 am
Forum: Support (DiffMerge)
Topic: Editable panel is not editable
Replies: 7
Views: 8917

Yeah, that works. Thanks Jeff.
by Cosmic Prune
Thu Jan 03, 2008 2:46 am
Forum: Support (DiffMerge)
Topic: Editable panel is not editable
Replies: 7
Views: 8917

Re: Perhaps I misunderstood your original situation.

Perhaps I misunderstood your original situation No, I think you were right first time. The code became branched and needs to be re-merged. The code in the repository is not newer, as such, and there are changes in my local version that need to be applied to the repository version. If anything, ther...
by Cosmic Prune
Wed Jan 02, 2008 4:39 pm
Forum: Support (DiffMerge)
Topic: Editable panel is not editable
Replies: 7
Views: 8917

Re: Files are read-only when using Vault's Show Diffs

If you have the current repository version and a parallel renegade version (in a different file/folder), you can just launch DiffMerge directly from the Start Menu and open the two files. Put your local/to-be-edited on in the right panel. Thanks Jeff, but I can't see how to put the repository versi...
by Cosmic Prune
Wed Jan 02, 2008 11:26 am
Forum: Support (DiffMerge)
Topic: Editable panel is not editable
Replies: 7
Views: 8917

Also, the "Show Merge" context menu item is not available ...
by Cosmic Prune
Wed Jan 02, 2008 10:36 am
Forum: Support (DiffMerge)
Topic: Editable panel is not editable
Replies: 7
Views: 8917

Editable panel is not editable

I apologise in advance for being a complete newbie. I have connected my Vault client to the repository where our source is stored and done a "Show Differences" against a Renegade file. The Diff comes up just as it should and there are differences clearly visible. I am merging some code and...