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

Postpone conflicts with ORIGINAL parts

From: Florian Weimer <fweimer_at_bfk.de>
Date: Wed, 12 Jan 2011 10:40:40 +0000

I've just discovered the "dc" command in the interactive merge
command. In my present, the ORIGINAL part is quite handy. Is there a
way to include it in postponed conflicts, besides copy and paste?

It seems to me that "dc" shows internal node numbers, not revisions
and repository paths.

(This is with 1.6.12, in case there have been subsequent
improvements.)

-- 
Florian Weimer                <fweimer_at_bfk.de>
BFK edv-consulting GmbH       http://www.bfk.de/
Kriegsstraße 100              tel: +49-721-96201-1
D-76133 Karlsruhe             fax: +49-721-96201-99
Received on 2011-01-12 11:41:21 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.