On Sun, Jun 24, 2012 at 06:28:15PM +0200, Sébastien Luttringer wrote:

...

On Sun, Jun 24, 2012 at 6:02 PM, Arno Gaboury wrote:

...

Is there a simple command line I can use, appart sdiff and Vimdiff?? if use pacdiff from pacman-contrib AFAIK pacdiff uses vimdiff too.

@ Arno

If you are not comfortable with vimdiff, you can try meld. It is graphical, though. I couldn't find any doc about pacdiff. I manually merged all my pacnew files using oldschool diff and a text editor. Not very conveniant, but it did the job. Now playing finally with Vimdiff, as there is a lot of good doc. Even if I am lost with all these keyboard commands, I like the dual screen interface, and think I will stick to it. I will maybe add an entry in

On 06/25/2012 06:55 AM, gt wrote: the *Pacnew and Pacsave* *files*, as I think a list of most used shortcuts could be explained. TY for all your advices.

On 06/25/2012 09:16 AM, Leonidas Spyropoulos wrote:

On Mon, Jun 25, 2012 at 7:00 AM, Arno Gaboury wrote:

...

On 06/25/2012 06:55 AM, gt wrote: I couldn't find any doc about pacdiff. I manually merged all my pacnew files using oldschool diff and a text editor. Not very conveniant, but it did the job. Now playing finally with Vimdiff, as there is a lot of good doc. Even if I am lost with all these keyboard commands, I like the dual screen interface, and think I will stick to it. I will maybe add an entry in the *Pacnew and Pacsave* *files*, as I think a list of most used shortcuts could be explained.

TY for all your advices. Dear Arno,

It's good that you find your way of dealing with pacnew files. Please take a look at the wiki page https://wiki.archlinux.org/index.php/Pacnew_and_Pacsave_Files And the forum link posted at the end of the wiki.

Another helpful tool is pacmatic (https://wiki.archlinux.org/index.php/Pacmatic#Consider_Using_Pacmatic) It automatically informs you if pacman created any pacnew files that you have to deal with.

A command like the: locate -e --regex "\.pac(new|orig|save)$" will help you find any pacnew files you have on your system, I usually use this in case I left over some when I did the merge and didn't delete the file after.

Regards Leonidas

Just installed pacmatic and did my first *$pacmatic -Syu*. Not bad indeed. TY for the pointer. I do think I am ready now to keep my pacman files updated with vimdiff. There are not so many shortcuts to learn indeed, and finally found it less scary for a beginner than vim

On 06/25/2012 02:42 PM, Kevin Chadwick wrote:

...

I like the dual screen interface, and think I will stick to it. I will maybe add an entry in the *Pacnew and Pacsave* *files*, as I think a list of most used shortcuts could be explained. Would be good if you copied that to this thread?

-- ________________________________________________________

Why not do something good every day and install BOINC. ________________________________________________________ What do you want me to copy in this thread? All most common keyboard commands using vimdiff?

On 06/25/2012 03:31 PM, Kevin Chadwick wrote:

...

On 06/25/2012 02:42 PM, Kevin Chadwick wrote:

...

...

I like the dual screen interface, and think I will stick to it. I will maybe add an entry in the *Pacnew and Pacsave* *files*, as I think a list of most used shortcuts could be explained. Would be good if you copied that to this thread?

What do you want me to copy in this thread? All most common keyboard commands using vimdiff?

No matter, thought you had a concise reference of shortcuts that may be worth seeing if it was handy.

-- ________________________________________________________

Why not do something good every day and install BOINC. ________________________________________________________ Please have a look at the WIKI. I added this morning the list of shortcuts you are talking about under section " A quick roundup of vimdiff "

On 06/25/2012 03:01 PM, Karol Blazewicz wrote:

On Mon, Jun 25, 2012 at 2:53 PM, Arno Gaboury wrote:

...

Please have a look at the WIKI. I added this morning the list of shortcuts you are talking about under section " A quick roundup of vimdiff " You seem to use 'insert mode' and 'edit mode' as the name for the same mode which may create confusion.

If you want, you can add a hint about

" Smart way to move between windows map <C-j> <C-W>j map <C-k> <C-W>k map <C-h> <C-W>h map <C-l> <C-W>l

that you need to put in your .vimrc. TY for the insert/edit mode. Corrected.

As for the other shortcuts, my first idea was to stick to the most useful and obvious one to do almost everything. Vim shortkey list is ssooo long that I didn't want to show too mamy. As a beginner, it is especially this kind of long list who at first kept me away from Vim! But feel free to add in the WIKI if you think it is worth.

The 24/06/12, Sébastien Luttringer wrote:

if use pacdiff from pacman-contrib

There's an awesome package out there to do exactly this stuff at Gentoo: dispatch-conf http://en.gentoo-wiki.com/wiki/Dispatch-conf It would be really nice if someone could hack on this tool to adapt it to arch by forking it or by submitting patches upstream. -- Nicolas Sebrecht