Thanks Timo,
I see the light now. 8?)
Paul
> -----Original Message-----
> From: Falk, Timo [SMTP:Falk@neumag.de]
> Sent: Friday, 20 August 2004 6:31
> To: dev@tortoisesvn.tigris.org
> Subject: RE: [TSVN] Dangerous merge in TSVN 1.0.8
>
> > -----Original Message-----
> > From: Paul van der Merwe [mailto:paul.vandermerwe@fp.co.nz]
>
> [..]
>
> > 4.) now Jo changed file X twice and commited it twice (no
> > problems), rev now
> > at 258. Both changes was at the start of the file
> > 5.) Pete changed the end of file X. When he commits he gets an error
> > "commit failed" because his working base is still at rev256
> > and the head of
> > the trunk is at 258.
> > 6.) Now what does he do??? If he does a diff he only sees his
> > "working base"
> > and his "working copy" in TMerge. He does not see the
> > differences between
> > the HEAD of the trunk Rev258, his working base and his
> > working copy. That
> > would be very easy if TMerge could show that.
>
> Pete should chose "Show Log" from the context-menu of the file(s) he
> changed an read the (hopefully) helpful commit-messages from Jo. If Jo
> was lazy Pete can chose "Compare with workingcopy" from the context-menu
> of the revisions in the log-messages-window.
>
> It's all there. You only need to know where.... ;)
>
> Timo
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
> For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Aug 23 08:07:12 2004