Jean-Marc van Leerdam <j.m.van.leerdam@...> writes:
>
> Hi,
>
> On 10 February 2010 04:40, David <dwhite@...> wrote:
> > Hello,
> >
> > This follows on from "File stuck in the Beyond", since it's the same
> > repository giving me trouble.
> >
> > I have two working directories for the repository - a new one (created by a
> > checkout last week) and an old one. There is a file in both working dirs
that
> > Tortoise says is the same as the base, yet a diff program shows differences
> > between them.
> >
> > If I do a "Diff with previous version" in the old working dir it shows the
> > differences from revision 2047, but if I do it in the new dir it shows the
> > differences from revision 2178. The revision graphs for the file in both
dirs
> > are the same. The logs for the file in each dir are the same (last change =
> > rev 2179) except that the old dir shows the revision 2048 line in bold, but
> > the new dir shows rev 2179 in bold.
> >
> > What is the cause of the discrepancy? Is it possible that a "Revert to this
> > revision" I did on a different file for the previous problem had a global
> > effect? How do I ensure that the current revision for _all_ files is the
> > latest one?
> >
>
> Did you do an update for both working copies? Try an 'update to
> revision...' and select HEAD to make sure both are pointing to the
> latest revision known to the repository.
>
I have now, and it replaced a whole bunch of stuff. That "Revert to revision"
must have done a lot more than I expected. All I wanted was one old file.
But now I again have a problem with the file I had deleted and wanted back. I
added it but the Commit says there's a conflict and won't do it. Then if I
do 'Resolved' and another Commit it says I have to do an Update, but another
Update does nothing. I just can't get it to accept the file no matter what I
do.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2446581
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-02-11 01:09:56 CET