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

Re: Merging Practices

From: Sean Laurent <sean_at_neuronfarm.com>
Date: 2005-01-31 21:24:52 CET

On Monday 31 January 2005 11:21 am, Dale Worley wrote:
> I suspect that this could be cured by updating your working copy as if
> (more or less) "svn copy -r B http://.../Template.fla ./Template.fla" had
> been done.

Unfortunately, it's definitely not as simple as updating my WC. I'm
absolutely positive I ran 'svn up' before doing the merge. However, I tested
this by checking out the branch at r810, attempted the merge and got the same
set of conflicts (Template.fla is just one of many):

$ svn co -r 810 http://server/svn/apps/branches/mytask mergetest
...
Checked out revision 810.

$ cd mergetest

$ svn merge -r 811:833 http://server/svn/apps/main . |grep "^C"
...
C flashsrc/fla/global/core/Template.fla

$ ls flashsrc/fla/global/core/Template.fla*
flashsrc/fla/global/core/Template.fla
flashsrc/fla/global/core/Template.fla.merge-left.r811
flashsrc/fla/global/core/Template.fla.merge-right.r833

$ svn pg svn:mime-type flashsrc/fla/global/core/Template.fla
application/octet-stream

-Sean
------------------------------
Frisbeetarianism, n.: The belief that when you die, your soul goes up on the
roof and gets stuck.
------------------------------

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 31 21:27:33 2005

This is an archived mail posted to the Subversion Users mailing list.