[Orgmode] Resolving overlapping clocked time between tasks?

[Jeff Kowalczyk]

I have related tasks from two org files/subtrees where a small percentage of 
the clocked time overlaps. These are a manual worklog and a generated git 
commit log, see below.

Does anyone have a suggestion about marking and/or resolving overlapping 
clocked time?

I plan to merge the subtrees and org-sort by closed time. Once sorted, manual 
inspection is possible, but error-prone and slow going.

My initial thought was to add the commits as negative time (i.e. 
clockout--clockin) to the manually clocked tasks. However, that doesn't 
subtract in clocktable summaries, see below.

Thanks for any ideas. Given some pointers to Org and Emacs functions and a 
suggested algorithm, I can code up some Emacs Lisp to get this done.

Thanks,
Jeff


---


file acme.org:

* Worklog ACME
#+BEGIN: clocktable :maxlevel 2 :scope subtree
Clock summary at [2009-09-11 Fri 20:38]

| L | Headline            | Time   |      |
|---+---------------------+--------+------|
|   | *Total time*        | *8:00* |      |
|---+---------------------+--------+------|
| 1 | Worklog ACME        | 8:00   |      |
| 2 | DONE Onsite at ACME |        | 8:00 |
#+END:

** DONE Onsite at ACME                    :onsite:deployment:acme:
   CLOSED: [2008-09-09 Tue 15:00]
   :LOGBOOK:
   CLOCK: [2008-09-09 Tue 10:18]--[2008-09-09 Tue 10:12] => -0:06
   CLOCK: [2008-09-09 Tue 07:00]--[2008-09-09 Tue 15:00] =>  8:00
   :END:

Onsite notes for the day, including commits to git repository.


---


file acme-git.org:

* Worklog Git Repository ACME
** DONE Commit 1                                        :git:acme:
   CLOSED: [2008-09-09 Tue 10:18]
   :LOGBOOK:
   CLOCK: [2008-09-09 Tue 10:12]--[2008-09-09 Tue 10:18] =>  0:06
   :END:
   :PROPERTIES:
   :commit: 3e9095ce125804ac3f741687855e50cebcd83fb1
   :END:
: Commit 1 body
: 
** DONE Commit 2                                        :git:acme:
   CLOSED: [2008-09-09 Tue 10:20]
   :LOGBOOK:
   CLOCK: [2008-09-09 Tue 10:18]--[2008-09-09 Tue 10:20] =>  0:02
   :END:
   :PROPERTIES:
   :commit: cd5827ba3d13b8215a3db61dc78cce019283a6a3
   :END:
: Commit 2 body
: 
** DONE Commit 3                                        :git:acme:
   CLOSED: [2008-09-10 Wed 09:53]
   :LOGBOOK:
   CLOCK: [2008-09-10 Wed 09:49]--[2008-09-10 Wed 09:53] =>  0:04
   :END:
   :PROPERTIES:
   :commit: ab2363840a9bb652468bbc4334f4fcaf8ca49f16
   :END:
: Commit 3 body
: