On Tue, Mar 31, 2009 at 03:35:31PM -0500, Jason Kraftcheck wrote:
> Tyler Roscoe wrote:
> > On Tue, Mar 31, 2009 at 02:54:25PM -0500, Jason Kraftcheck wrote:
> >> A user just checked in a change set that resulted in the following:
> >> A file was removed
> >> An identical file was added
> >> An automated email message included the following:
> >> Property changes on: MOAB/trunk/tools/dagmc/Makefile.am
> >> ___________________________________________________________________
> >> Name: svn:mergeinfo
> >> +
> >>
> >> I now cannot access the history of the file before that version. For example:
> >>
> >> svn copy --revision 2785 \
> >> https://svn.mcs.anl.gov/repos/ITAPS/MOAB/trunk/tools/dagmc/Makefile.am .
> >> svn: Unable to find repository location for
> >> 'https://svn.mcs.anl.gov/repos/ITAPS/MOAB/trunk/tools/dagmc/Makefile.am' in
> >> revision 2785
> >
> > My guess:
> >
> > The Makefile.am that existed in revision 2785 is not the same as the new
> > file named Makefile.am. They have the same name, but Subversion is smart
> > enough to know that they are in fact different files with different
> > ancestry.
>
> The files were identical?
Irrelevant. They have different histories, so they are different
entities.
To see what I mean, you could try something like this in a sandbox:
touch a
svn add a
svn commit -m "a: version 1"
svn rm a
svn commit -m "removing a: version 1"
echo "i am a version 2!" > a
svn add a
svn commit -m "a: version 2"
And then look at the results of "svn log a".
> > Why did this part happen:
> >
> >> A file was removed
> >> An identical file was added
> >
> > ? What was the user trying to do?
> >
>
> Nothing (with respect to the file in question). Or at least that's what she
> told me.
Well something doesn't add up here. The fact that svn:mergeinfo was
tweaked suggests that some sort of merge operation was included in this
commit.
I would ask the user to walk me through exactly what she did, and to
think about any "old" operations she might have performed on her
subversion working copy since her last commit.
What client was she using?
tyler
Received on 2009-03-31 22:49:35 CEST