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

Re: Merging Binary files

From: claudia logan <cvlogan1_at_yahoo.com>
Date: 2007-07-13 14:08:03 CEST

Yes, you are correct. 99.9% of the time, there is only one author per document. So conflicts may be minimal or not at all. Our process states that once a baseline is created (i.e. branches) only approved changes are made to it, while new dev. is made in the trunk. This great with code, while documents are not as dynamic (I mean, who likes to write documents..right). Anyway, I think I am not quite yet used to Subversion's paradigm of one repo revision. I am more familiar with other CM systems where each file has its own version and thus easier to "thread/tag". I am sure the right process will handle this, I just need to find it.

Matt Madrid <admiralcap@gmail.com> wrote:
  Ok, so you want to basically copy the file from one place to another
using svn merge. Yes.

Understand what merge realy does....


So, since you know the file that is to be replaced, that would be the

There are situations where you sould get conflicts, but I'm guessing
in your situation that wouldn't happen often.


On 7/12/07, Ryan Schmidt wrote:
> On Jul 12, 2007, at 05:40, claudia logan wrote:
> > But is there a way to just force binary merge since I know this is
> > what I want, or "turn off" the diff for them. This process should
> > be completed with minimal effort and short amount of time. It
> > seems is almost easier to just "copy-n-paste" from trunk to branch
> > and finish sooner.
> I think you're asking: is there a way to "turn off" the conflict, and
> have Subversion just use the new version, overwriting the old
> version, regardless of conflicts. No, there isn't. After you merge,
> you will probably get a conflict. If you want to overwrite the old
> version, then do that (move the new file over the original file, and
> then tell Subversion the conflict is resolved). If this is too much
> work, then you can write a wrapper around svn merge, which does the
> merge and then does the moving and resolving. Call this wrapper
> instead of calling svn merge directly.
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Don't be flakey. Get Yahoo! Mail for Mobile and
always stay connected to friends.
Received on Fri Jul 13 14:07:50 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.