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

Re: Merging a single edit, but the file was moved during the commit.

From: Ryan Schmidt <subversion-2006Q1_at_ryandesign.com>
Date: 2006-05-01 23:34:31 CEST

On Apr 30, 2006, at 05:00, Dan Mahn wrote:

> I had another merging problem on Friday that I need to look into.
> We created another database for real work. We entered the current
> version of code and made a branch for one of us, then started
> working with the branch. The first thing we noticed after we did a
> build was that we needed an additional "ignore" property on a
> directory. We added it to the branch, switched to trunk, then
> tried to merge the property change. We could've just set the
> property in trunk, but I wanted to show another person how to merge
> the change. The log for the branch told me that the last two
> revisions were 6 and 8. Revision 8 was the one where I had added
> the property. I did the merge from the branch, specifying revision
> 6 to 8, but it didn't do anything. I tried this twice. Then I
> tried merging from 6 to HEAD, and it merged the change. Am I wrong
> that merging from 6 to 8 should perform the changes I made when
> committing revision 8? I don't understand why it didn't work.

The way you describe it, it sounds to me like it should have worked
the way you expected. The fact that it didn't means that we're
missing some detail. It would be easier to diagnose the unexpected
behavior if you would transcribe exactly what Subversion commands you
type in, including all necessary commands to create the current state
of the relevant sections of your repository (or provide a copy of
your repository). Without this, I don't think we're going to be able
to explain it properly.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 1 23:45:37 2006

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.