Question

For those unfamiliar with CVS, cvs -nq update shows something like this.

$ cvs -nq update
M file_changed_locally.c
U file_changed_remotely.c
C file_with_conflicts.c
? untracked_file.c

I know I can use hg status to get locally modified files, and hg incoming to list changesets yet to be pulled, but is there a way to get a report like the above that combines local and remote changes at the file level?

An acceptable (but worse) substitute would be something that shows the relevant data for between hg pull and hg update.

Answer 1

Here’s what I ended up with:

$ hg pull && hg status --rev .:

It lists files that will be touched by hg update.