Cameron Simpson cs at zip.com.au
Tue Nov 8 21:20:45 CET 2011

• Previous message: [Python-Dev] Merging 3.2 to 3.3 is messy because "Misc/NEWS"
• Next message: [Python-Dev] Merging 3.2 to 3.3 is messy because "Misc/NEWS"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

On 09Nov2011 07:19, I wrote:
| Yes it does. I use this facility to merge timesheet files mainatined on
| separate hosts (home machine, travelling laptop) in my hgbox script.
| The hgrc says:
| 
|   [merge-patterns]
|   timesheets-cameron/2* = merge-dumb
|   dailylog-cameron/2*/[A-Z]* = merge-dumb
| 
| so it is easy to specify a particular tool to merge particular files.

Oh yes, the associated clause:

  [merge-tools]
  merge-dumb.args = $local $other > $output

to specify how merge-dumb is invoked.

Cheers,
-- 
Cameron Simpson <cs at zip.com.au> DoD#743
http://www.cskk.ezoshosting.com/cs/

I was gratified to be able to answer promptly and I did.
I said I didn't know.   - Mark Twain

---

• Previous message: [Python-Dev] Merging 3.2 to 3.3 is messy because "Misc/NEWS"
• Next message: [Python-Dev] Merging 3.2 to 3.3 is messy because "Misc/NEWS"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

More information about the Python-Dev mailing list