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

[Ryan Schmidt <su...@ryandesign.com>]

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

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

[Dan Mahn <sv...@digidescorp.com>]

Ryan Schmidt wrote:
> 
> 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.
> 

Yes, thanks.  Actually, I can't reproduce this behavior.  I have tried 
several different ways.  Sorry ... I should have tried to reproduce it 
first before I mentioned it here.  I can't reproduce it, but I don't 
think I did anything "wrong" either.  I guess it will remain a mystery.

I found another not-so-nice thing today, but at least I understand it. 
If I add a directory in my branch, then try to switch back to the trunk, 
I get an error and a half-switched working copy.  This is because when I 
switch, it wants to delete the directory, and I have some compiler 
output stuff in there.  I needed to do a "make clean" before switching, 
and make sure all extraneous files and directories were gone (we use 
sub-directories to hold the compiler output).  I realize now that this 
is only a problem when adding/deleting directories.  I wish it would 
just "un-version" the new (version-controlled) directory instead of 
leaving the working copy in a half-switched state.  The error it gives 
is "Won't delete locally modified directory '<full path>'".  Like I 
said, it's too bad this couldn't be a warning instead of an error, but 
it's probably "safer" to make an error and stop.  If nothing else, it 
would've been "polite" to try to reconstruct the previous contents of 
the working copy, but I suppose that's easier said than done.

- Dan


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