[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: another merging issue

From: Stefan Wild <stefan.wild_at_autinity.de>
Date: Mon, 06 Sep 2010 11:50:02 +0200

Am 03.09.2010 17:35, schrieb Bob Archer:
>> Doh! Good point. But, I think he is saying he wants to see what
>> changes were merged in that he didn't originally have in BASE.
>>
>> In other words... he has myfile.txt in his WC with a BASE or r100.
>> He works on it for a while and then does an update. He sees that
>> myfile.txt was "Updated" with no conflicts. No his BASE is r123...
>> he wants to right click on the file in WC and see the diffs that he
>> just brought down, in other words what changes were made between
>> r100 and r123. There is no way to do that diff in regards to the
>> working copy file. (Which I totally understand)
> Of course, if he is talking about a "merge" which is the subject of this thread... then he is doing it wrong. You should NOT be merging into a dirty (one with local changes) working copy.
>
no, I meant it like described above: auto- (non-conflict)- merge of some single files while updating a "dirty" wc. that's the subject, though merging a branch uses the same word for another issue I didn't talk about.
If it's really not possible as you said, I have to try it like discussed last week.

-- 
Mit freundlichen Grüßen
Stefan Wild
autinity systems GmbH
Neefestraße 42
D-09119 Chemnitz
Amtsgericht Chemnitz HRB: 21552
Telefon: +49 (0) 371 918897-50
Fax:     +49 (0) 371 918897-49
email:   stefan.wild_at_autinity.de
web:     www.autinity.de
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2655967
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-06 11:50:24 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.