Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>WBlasko</p> <p>I've found the same problem. I wanted to change files and merge them when needed instead of waiting for some other developer to unlock it. The solution that worked for me was:</p> <p>1) Get the latest version of a VSS project (I placed all VSS projects under vss):</p> <pre><code>c:\vss\projectA </code></pre> <p>2A) Initialize with Mercurial</p> <pre><code>cd vss\projectA C:\vss\projectA&gt;hg init </code></pre> <p>2B) Clone the project to the place where it could be changed at will</p> <pre><code>hg clone vss\projectA myProjects\projectA </code></pre> <p>3) Grab the latest changes from the VSS copy (skip if you came from 1 and 2)</p> <pre><code>C:\myProjects\projectA&gt;hg pull C:\myProjects\projectA&gt;hg update (solve conflicts if any) </code></pre> <p>4) Work at will with the cloned version. Later, push your work to the vss copy:</p> <pre><code>C:\myProjects\projectA&gt;hg push (don't run hg update yet, wait for VSS latestes version) </code></pre> <p>5) Now, perform a checkout of all files to the VSS project</p> <p>6) Run "hg update" on the VSS project to merge your changes to the latest VSS changes.</p> <pre><code>C:\vss\projectA&gt;hg update (if there are conflicts, resolve them) </code></pre> <p>7) Commit the changes</p> <pre><code>C:\vss\projectA&gt;hg commit </code></pre> <p>8) Perform a VSS checkin (releasing the locks to the other folks) Go back to step 3. repeat steps 3-8 forever then... ;-)</p> <p>This way you can work with a good version control system while still being able "talk" to legacy projects. You will be also be able to enjoy: a) No problem with locked files b) you can share your repository with others that know how to use Hg c) make branches , etc</p> <p>Just be carefull to first update/solve conflicts, test and then perform VSS checkin</p> <p>Cheers, Luis</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload