Interesting situation in my WC, can't commit a changed file

[Mark Parker <ma...@msdhub.com>]

As way of background, I'm currently working on a project which is going 
to be making a change of platform. I've got my WC that I always had, 
running on the old platform, and a new WC with only the changes 
(uncommitted) needed to make it run on the new platform.

Now, I've run into a situation. One of the files that had changed in the 
new WC was moved in the old WC and committed. I updated in the new WC, 
and the old file was made unversioned (expected) and the file from the 
old WC appeared in the new location (also expected). However, when I 
manually moved the modified file into it's new location in the new WC, 
subversion doesn't believe that it's modified.

Here's how it went:

old-wc:

$ svn mv old\path\file new\path\file
A         new\path\file
D         old\path\file

$ svn ci -m "moved a file"
Adding         new\path\file
Deleting       old\path\file


then, in new-wc:

$ svn up
A    new\path\file
D    old\path\file

(at this point, old\path\file is still there, but unversioned)

$ move old\path\file new\path\file

$ svn stat
[bunch of changes, which don't include new\path\file]


I _KNOW_ that it's different, if I look at the text-base file I can see 
the line that changed. Bizzarely, diff tells me they're the same:

$ diff -s file .svn\text-base\file.svn-base
Files file and .svn\text-base\file.svn-base are identical


My question is, how do I make subversion recognize that it needs to be 
committed?

Mark


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

Re: Interesting situation in my WC, can't commit a changed file

[Phillip Susi <ps...@cfl.rr.com>]

Boy that is weird.  Are you sure that they are different?  It is hard to 
believe that the files actually are different if diff says they aren't. 
  Try md5sum file and md5sum .svn/text-base/file.svn-base.

Mark Parker wrote:
> As way of background, I'm currently working on a project which is going 
> to be making a change of platform. I've got my WC that I always had, 
> running on the old platform, and a new WC with only the changes 
> (uncommitted) needed to make it run on the new platform.
> 
> Now, I've run into a situation. One of the files that had changed in the 
> new WC was moved in the old WC and committed. I updated in the new WC, 
> and the old file was made unversioned (expected) and the file from the 
> old WC appeared in the new location (also expected). However, when I 
> manually moved the modified file into it's new location in the new WC, 
> subversion doesn't believe that it's modified.
> 
> Here's how it went:
> 
> old-wc:
> 
> $ svn mv old\path\file new\path\file
> A         new\path\file
> D         old\path\file
> 
> $ svn ci -m "moved a file"
> Adding         new\path\file
> Deleting       old\path\file
> 
> 
> then, in new-wc:
> 
> $ svn up
> A    new\path\file
> D    old\path\file
> 
> (at this point, old\path\file is still there, but unversioned)
> 
> $ move old\path\file new\path\file
> 
> $ svn stat
> [bunch of changes, which don't include new\path\file]
> 
> 
> I _KNOW_ that it's different, if I look at the text-base file I can see 
> the line that changed. Bizzarely, diff tells me they're the same:
> 
> $ diff -s file .svn\text-base\file.svn-base
> Files file and .svn\text-base\file.svn-base are identical
> 
> 
> My question is, how do I make subversion recognize that it needs to be 
> committed?
> 
> Mark
> 
> 


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