FW: Merging two unrelated branches deletes files, then recreates them, rather than merging the contents
From: Thomas Sturgeon <thomas.sturgeon_at_kineticsusa.com>
Date: 2005-12-07 17:21:00 CET
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
I have also included a set of commands that I followed to get to the
The question is , how do I take two unrelated directories and merge
-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/
Adding experiment/mycode/words1
Adding experiment/mycode/numbers1
Committed revision 1.
-bash-3.00$ svn import -m "Importing 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
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.
---------------------------------------------------------------------
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.