[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: FW: Merging two unrelated branches deletes files, then recreates them, rather than merging the contents

From: T L Holaday <tjvnzk03_at_sneakemail.com>
Date: 2005-12-08 12:39:53 CET

Is this just an experiment or does it reflect a real case? That is, do you
have a legacy of pre-subversion code that is in multiple directory trees
such "Steve's version" and the "Alice's version" that you want to import
into a Subversion repository and end up with a single directory tree
composed of files that are merges of Steve's and Alice's originals?

If that is the case, in order to merge "the file level changes" you will
need a third directory tree reflecting the files in the state they were
before Steve and Alice made any changes. Do you have that? If so, you
could use that tree to populate Subversion with the originals, then create
two working directories, one for Steve and one for Alice, copy Steve's files
into the first and Alice's into the second, commit Steve, commit Alice, and
merge the conflicts.

On 12/7/05, Thomas Sturgeon
thomas.sturgeon-at-kineticsusa.com|Subversion.Users/gmailLabelled|<
...> wrote:
>
> Greetings,
>
>
>
> I have attached a zip of my experiment to this e-mail.
>
>
>
> I am sure that I am missing some major concept when it comes to
> subversion.
>
>
>
> I have also included a set of commands that I followed to get to the point
> where my process broke.
>
>
>
> The question is , how do I take two unrelated directories and merge their
> contents, including file level changes?
>
>
>
> -bash-3.00$ mkdir experiment
>
> -bash-3.00$ cd experiment
>
> -bash-3.00$ mkdir mycode
>
> -bash-3.00$ mkdir vendorcode
>
> -bash-3.00$ cd mycode/
>
> -bash-3.00$ vi words1
>
> -bash-3.00$ vi numbers1
>
> -bash-3.00$ cp numbers1 ../vendorcode/
>
> -bash-3.00$ cp words1 ../vendorcode/
>
> -bash-3.00$ cd ..
>
> -bash-3.00$ cd vendorcode/
>
> -bash-3.00$ ls
>
> numbers1 words1
>
> -bash-3.00$ vi words1
>
> -bash-3.00$ vi numbers1
>
> -bash-3.00$ mkdir includes
>
> -bash-3.00$ cd includes/
>
> -bash-3.00$ vi includes
>
> -bash-3.00$ cd ..
>
> -bash-3.00$ ls
>
> includes numbers1 words1
>
> -bash-3.00$ cd ..
>
> -bash-3.00$ cd ..
>
> -bash-3.00$ svnadmin create my_repos
>
> -bash-3.00$ svn import -m "Importing mycode" ./experiment/mycode/
> file:///home/thomas.sturgeon/my_repos/
>
> Adding experiment/mycode/words1
>
> Adding experiment/mycode/numbers1
>
>
>
> Committed revision 1.
>
>
>
> -bash-3.00$ svn import -m "Importing vendorcode" ./experiment/vendorcode/
> file:///home/thomas.sturgeon/my_repos/vendorcode
>
> Adding experiment/vendorcode/words1
>
> Adding experiment/vendorcode/includes
>
> Adding experiment/vendorcode/includes/includes
>
> Adding experiment/vendorcode/numbers1
>
>
>
> Committed revision 2.
>
> -bash-3.00$ pwd
>
> /home/thomas.sturgeon
>
>
>
> -bash-3.00$ svn co file:///home/thomas.sturgeon/my_repos/mycode ./wc
>
> A wc/words1
>
> A wc/numbers1
>
> Checked out revision 2.
>
>
>
> -bash-3.00$ svn merge file:///home/thomas.sturgeon/my_repos/vendorcode
> file:///home/thomas.sturgeon/my_repos/mycode ./wc
>
> D wc/words1
>
> A wc/words1
>
> D wc/numbers1
>
> A wc/numbers1
>
> Skipped missing target: 'wc/includes'
>
> -bash-3.00$
>
>
>
>
>
> Thanks,
>
> Thomas Sturgeon
>
>
>
> This electronic transmission is strictly confidential and intended solely
> for the addressee. It may contain information that is covered by legal,
> professional, or other privilege. If you are not the intended addressee, you
> must not disclose, copy or take any action in reliance of this transmission.
> If you have received this transmission in error, please notify the sender as
> soon as possible.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
>

--
~tlholaday()
Received on Thu Dec 8 12:43:36 2005

This is an archived mail posted to the Subversion Users mailing list.