The leading provider of version control solution and TWAIN SDK
The leading provider of version control solution and TWAIN SDK

Dynamsoft Forums

Support for Version Control, Bug Tracking and Configuration Management Software
* Login   * Register
* FAQ    * Search

It is currently Mon May 21, 2012 1:57 pm




Post new topic Reply to topic  [ 2 posts ] 
Author Message
 Post subject: What is the Best Way to Merge 2 Project Structures
PostPosted: Sun Nov 20, 2011 5:11 pm 
Offline

Joined: Sun Nov 20, 2011 4:26 pm
Posts: 1
I have a hierarchical project that has changed its structure between versions. I presently have a production version called "pro1" and a development version called "int1". Neither were under source control before now, and I am trying to make a single source tree while also preserving the old ("pro1") and new ("int1") hierarchy. In the new hierarchy, some levels have been pruned; other levels added; and some levels have added and/or modified files. My approach so far is to establish a starting point as if all the files in the "pro1" version had been checked-out before int1 was developed. Then treat int1 as if it were developed normally and checked-in as a new release. This is a php project and the structure is important to capture and maintain, but I am aiming to keep the deployed system from being sloppy -- carrying forward an old and new structure... What I have done to set this up so far is listed below. Right now I am exploring the forum for anyone who may have a way to merge/prune the structure so that when I check-out a Label, I only get the new structure, and none of the old structure.

    Created new project called FOO_Code.
    Added all content of original hierarchy to the project.
    Assigned a project-level Label: "pro1" to FOO_Code.
    Checked-out entire project into new working folder: dev1
    Merged new hierarchy and changed/added files into dev1.
    Checked-In all of the contents of the hierarchy.
    Assigned project-level Label: "int1"

I envision the solution should be where the old and new structures are possibly created as separate projects, Labeling the old and new project as pro1 and int1, respectively. The somehow merging the two projects; or similar... Any ideas?


Top
 Profile  
 
 Post subject: Re: What is the Best Way to Merge 2 Project Structures
PostPosted: Thu Dec 01, 2011 2:10 am 
Offline
User avatar

Joined: Tue Mar 08, 2005 12:23 am
Posts: 1489
Hi Bojames,

Bojames wrote:
Created new project called FOO_Code.
Added all content of original hierarchy to the project.
Assigned a project-level Label: "pro1" to FOO_Code.
Checked-out entire project into new working folder: dev1
Merged new hierarchy and changed/added files into dev1.
Checked-In all of the contents of the hierarchy.
Assigned project-level Label: "int1"

Getting the project by the 2nd label "int1" will get all files including files that should only be in the old structure.

The below approach might work better:

1. Create a new project called "Foo_code";
2. Designate this project as a "Web project" and put in the destination (FTP) info (SAWH server manager->Repositories->{current repository}->Web projects). Please refer to:
http://www.dynamsoft.com/help/SAW%20Hosted/Server%20Manager/Database/Repositories/Web%20Projects.htm
3. Open the client, go to Tools->Wildcard Search and put the right Check In dates (the time that the files belonging to the new structure were checked in);
4. In the "Search Result" window, choose the files of the new structure (probably all of them) and click on "Web Deploy" and the wanted files will be copied/uploaded to the destination (FTP) you specified for this project.
5. Thus only the files plus the new structure of the project are available for deployment.

_________________
Catherine Sea
Dynamsoft Support Team
Dynamsoft - The leading provider of version control solution and TWAIN SDK
Source Control Software | Software Configuration Management | SCM Solution | Issue Tracking
SourceSafe (VSS) Remote/Web/Internet Access | SourceSafe (VSS) Replacement/Alternative | SourceSafe (VSS) Hosting|TFS Hosting

Follow me @Twitter, Facebook
Image


Top
 Profile  
 
Display posts from previous:  Sort by  
Post new topic Reply to topic  [ 2 posts ] 

It is currently Mon May 21, 2012 1:57 pm


Who is online

Users browsing this forum: No registered users and 0 guests


You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum

Search for:
Jump to:  
cron

Copyright © 2010 Dynamsoft Corporation. All Rights Reserved. | Knowledge Base | Source Control Blog