[liblouis-liblouisxml] Re: Best way to keep an svn branch updated or synchronized with trunk

  • From: Michael Whapples <mwhapples@xxxxxxx>
  • To: liblouis-liblouisxml@xxxxxxxxxxxxx
  • Date: Tue, 19 Jan 2010 00:15:09 +0000

Its a bit of the same reason why I didn't want to give a specific command, I don't want to be held responsible if it goes wrong.
Looking at the help message for svn merge I draw the following conclusion. If you are in a working copy of the branch then you should be able to do: 
svn merge -r n:m url_of_trunk
where n is the starting revision of changes you want to merge and m is the last revision of the changes you want to merge and url_of_trunk is the URL of the trunk on the SVN server. So you will need to keep track of when you have done these merges, as this merges it to the working copy, you will need to commit the merge, the commit message would be a good place. This should be working only on the working copy so if it goes wrong hopefully only the working copy will be messed up, may be make a working copy just for this merge.
I am very tempted to raise the topic of other version control systems, I believe with mercurial this would be much easier. I believe git would also be easier as well, although I am less certain on this one. 

Michael Whapples
On 01/18/2010 11:26 PM, John J. Boyer wrote:

I need the exact command to merge trunk with
branches/universal-tactile-document in my working copy. I'm too chicken
to experiment.

The only new mudule in the branch will be make_UTD.c, but other modules
will have calls to functions within it as time goes on.

John

On Mon, Jan 18, 2010 at 09:47:15PM +0000, Michael Whapples wrote:

I think what needs doing is to merge changes from the trunk to the
branch. I can't remember exactly commands for that but its the same as
any other merge as branches are just more folders.

Michael Whapples
On 01/18/2010 08:40 PM, John J. Boyer wrote:

I have just created the universal-tactile-document branch in liblouisxml
svn. What is the best way to keep it updated or synchronized with trunk.
I want to avoid any possibility of changing trunk, and I prefer to work
in my working copy, then commit.

Qanks,
John



For a description of the software and to download it go to
http://www.jjb-software.com


For a description of the software and to download it go to
http://www.jjb-software.com

Other related posts:

  1. Home
  2. liblouis-liblouisxml
  3. Archive
  4. 01-2010