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

Merging Binary files

From: claudia logan <cvlogan1_at_yahoo.com>
Date: 2007-07-11 23:18:14 CEST

Hi all,
  We recently migrated all our efforts into subversion and started creating branches and tags. Our process states that all changes are made in the trunk. Once we determine to "formally" create a branch in prep. for release, a POC (yours truly) creates the branch. which then goes to testing...etc. days later an approved change is made in the trunk then is merged to the branch. So having said this, I have two questions:
  1. When I try to do a merge of only binary files, ie. word docs into the branch, I keep getting: Skipped FolderName.... and conflicts, and creates 2 files: filenameRright and FilenameRleft. When I do a status It states it as "C" conflict. How do I merge a binary file? AND include the Skipped Foldername?
  I am executing the following command:
  svn merge http://:my_repo/trunk/projectA/doc \
  http:/my_repo/branch/BranchName/doc .
  I want the latest and greatest from the trunk into the branch. Is this cor
  2. From the best practices point of view, is this the best way to implement our process?
  Thanks sooo much for your help!

8:00? 8:25? 8:40? Find a flick in no time
 with theYahoo! Search movie showtime shortcut.
Received on Wed Jul 11 23:17:54 2007

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.