Gentoo Archives: gentoo-user

From: Shalom Ben-Zvi Kazaz <shalom938@×××××.com>
To: gentoo-user@l.g.o
Subject: [gentoo-user] using meld with dispatch-conf
Date: Wed, 06 Mar 2013 18:17:25
Message-Id: 51378825.6010008@gmail.com
1 Hello list
2
3 meld is the only merge tool I can work with, I configured meld in
4 dispatch-conf.conf like that : diff="meld '%s' '%s'"
5 it works and after a merge i am back in dispatch-conf screen,
6
7 >> (1 of 1) -- /etc/inittab
8 >> q quit, h help, n next, e edit-new, z zap-new, u use-new
9 m merge, t toggle-merge, l look-merge:
10
11 I press q to quite. and another dispatch-conf run is doing this:
12
13 RCS file: /var/db/dispatch-conf/config-archive/etc/inittab,v
14 1.1 locked
15 done
16 /var/db/dispatch-conf/config-archive/etc/inittab,v <--
17 /var/db/dispatch-conf/config-archive/etc/inittab
18 new revision: 1.2; previous revision: 1.1
19 done
20 /var/db/dispatch-conf/config-archive/etc/inittab,v -->
21 /var/db/dispatch-conf/config-archive/etc/inittab
22 co: /var/db/dispatch-conf/config-archive/etc/inittab,v: no side branches
23 present for 1.1
24 /var/db/dispatch-conf/config-archive/etc/inittab,v <--
25 /var/db/dispatch-conf/config-archive/etc/inittab
26 new revision: 1.1.1.1; previous revision: 1.1
27 done
28
29
30
31
32 My question is if that is ok? is the second dispatch-conf a must?
33
34 Thank you.