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

issue 3432 - summary of conflicts and skips

From: Daniel Näslund <daniel_at_longitudo.com>
Date: Thu, 30 Jul 2009 17:05:51 +0200

Hello!

I'm a newbie looking into issue 3342. I need some advice on the design
of the solution.

If I do an update s summary is printed. If there are conflicts a summary
for each file is printed after each interactive operation. If many
files, the summary may scroll off the screen. An example:

test2> s up
Conflict discovered in 'foo1'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
G foo1
Conflict discovered in 'foo2'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: mc
G foo2
Updated to revision 2.

Better would be to have this printed at the bottom:
...
G foo1
G foo2
Updated to revision 2.

In subversion/svn/update-cmd.c a notify()-function is registered which
gets called whenever there is new information that libsvn_client wants
to pass through. My idea was to create another notify()-callback inside
libsvn_client that could store the notifications the command produces
and then at the end call the original notify() function in svn. That way
all notifications would get printed last. Is this a working solution?

I assume that there are notifications which needs to be sent at exactly
the right time. How do I know which notifications that can be sent at
the end?

BTW If anyone has suggestions for small projects for someone learning
the Subversion code I would be glad to hear them. The issue tracker
doesn't have that many bite-sized tasks.

Mvh
Daniel Näslund (dannas)

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2377000
Received on 2009-07-30 17:06:17 CEST

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