On Fri, Jul 08, 2005 at 03:23:27PM -0500, Ben Collins-Sussman wrote:
> On Jul 8, 2005, at 10:23 AM, erh@swapsimple.com wrote:
> > I ran into a problem with trying to merge changes to a file
> >that was
> >moved. If I have a file, and a branch with the file, I normally
> >merge the
> >changes on the branch with new changes from the trunk with a
> >command like
> >this:
> > cd /path/to/checkedout/branch
> > svn merge -r123:124 http://blah/trunk
> >
> >This works fine until I move a file on the trunk. The next time I
> >do a
> >merge after that, the file gets moved on the branch, but ALL changes I
> >made on the branch are lost.
>
> They're not lost; the file you were editing becomes 'unversioned',
huh? I'm not editing it, it's checked in already! The changes already
in the repository on the branch are ignored when the "merge" occurs.
> There's a bug filed on this already, if you want to read more:
>
> http://subversion.tigris.org/issues/show_bug.cgi?id=2282
thanks, I'll take a look.
eric
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 8 23:15:49 2005