Author Topic: Win7x64:B5 vsmerge doesn't seem to work correctly  (Read 1940 times)

TKasparek

  • Senior Community Member
  • Posts: 221
  • Hero Points: 27
Win7x64:B5 vsmerge doesn't seem to work correctly
« on: September 23, 2014, 11:50:23 pm »
I'm using the following in the TortoiseSVN->Diff Viewer->Merge Tool:
vsmerge %base %mine %theirs -sc "%HOMEPATH%\Documents\My SlickEdit Config\19.0.0"
The base file is shown as -sc and not the base as expected which makes the merges not save to the base file.
If I remove the -sc and on to not have it load a configuration (I can't remember why I needed this... won't source code color correctly maybe?) it won't open vsmerge at all.

~Tom

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2390
  • Hero Points: 133
Re: Win7x64:B5 vsmerge doesn't seem to work correctly
« Reply #1 on: September 24, 2014, 02:24:29 pm »
Try putting the -sc args first.

TKasparek

  • Senior Community Member
  • Posts: 221
  • Hero Points: 27
Re: Win7x64:B5 vsmerge doesn't seem to work correctly
« Reply #2 on: September 24, 2014, 02:47:32 pm »
I'll possibly have another merge later this afternoon and I'll give this a shot. Is this just a trial to get me through?

I shouldn't need the -sc args at all correct?

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2390
  • Hero Points: 133
Re: Win7x64:B5 vsmerge doesn't seem to work correctly
« Reply #3 on: September 24, 2014, 03:11:52 pm »
You shouldn't need it unless you want to specify a configuration directory other than the default one.

TKasparek

  • Senior Community Member
  • Posts: 221
  • Hero Points: 27
Re: Win7x64:B5 vsmerge doesn't seem to work correctly
« Reply #4 on: September 24, 2014, 05:04:25 pm »
So this appears to be my issue, it looks like I've had this setup wrong all along. (I've only used is as a reference before the last few days) The arguments should be:
vsmerge [options] %base %mine %theirs %merged
Sorry for my confusion.

The /h command line argument for vsmerge in v18 shows help while it doesn't in v19. I couldn't find any argument information in the help files.

~Tom


Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2390
  • Hero Points: 133
Re: Win7x64:B5 vsmerge doesn't seem to work correctly
« Reply #5 on: September 24, 2014, 05:26:07 pm »
The /h command line argument for vsmerge in v18 shows help while it doesn't in v19. I couldn't find any argument information in the help files.
That sounds like something that needs repair.  Let me look at this.

Dan

  • SlickEdit Team Member
  • Senior Community Member
  • *
  • Posts: 2390
  • Hero Points: 133
Re: Win7x64:B5 vsmerge doesn't seem to work correctly
« Reply #6 on: September 24, 2014, 05:47:45 pm »
Fixed for next drop.  Thanks for the report!