On 7/13/07, 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....
>
> svn merge FROM_THIS_FILE@HEAD TO_THIS_FILE@HEAD PUT_IT_HERE
Sorry, maybe not enough info....
The FROM_THIS_FILE and PUT_IT_HERE should be the same. The
TO_THIS_FILE is the url to the file that is the "latest and greatest."
See, merge says... I want you to change FROM_THIS_FILE@REVISION ...
TO_THIS_FILE@REVISION .... and I want you to put the changed file in
PUT_IT_HERE
for binary files, there is rarely going to be a conflict here.
>
> So, since you know the file that is to be replaced, that would be the
> FROM_THIS_FILE ... AND... the PUT_IT_HERE
>
> There are situations where you sould get conflicts, but I'm guessing
> in your situation that wouldn't happen often.
>
> Matt
>
> On 7/12/07, Ryan Schmidt <subversion-2007b@ryandesign.com> 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
Received on Fri Jul 13 13:51:51 2007