logo       
Google Custom Search
    AddThis Social Bookmark Button
-->

darcs patch: msg#00030

Subject: darcs patch
Wed Oct 13 09:13:33 MST 2004  Will <will@xxxxxxxxxx>
  * quote conflict attribute values in xml output

New patches:

[quote conflict attribute values in xml output
Will <will@xxxxxxxxxx>**20041013161333] {
hunk ./Patch.lhs 2891
-              = if use_xml then ["<remove_file conflict=true>" ++
+              = if use_xml then ["<remove_file conflict='true'>" ++
hunk ./Patch.lhs 2901
-              = if use_xml then ["<add_file conflict=true>" ++
+              = if use_xml then ["<add_file conflict='true'>" ++
hunk ./Patch.lhs 2916
-              = if use_xml then ["<modify_file conflict=true>" ++
+              = if use_xml then ["<modify_file conflict='true'>" ++
hunk ./Patch.lhs 2927
-              = if use_xml then ["<remove_directory conflict=true>" ++
+              = if use_xml then ["<remove_directory conflict='true'>" ++
hunk ./Patch.lhs 2937
-              = if use_xml then ["<add_directory conflict=true>" ++
+              = if use_xml then ["<add_directory conflict='true'>" ++
}



Context:

[clarify that boringfile is a repository path
andrew@xxxxxxxxxxx**20041012205127] 
[fix bug where new files didn't show up in darcs diff.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041013111107] 
[fix bug in slurp_recorded_and_unrecorded when called from a different 
directory.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041013110922] 
[make pull prompt for confirmation when there is a conflict with unrecorded 
changes.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041013111327] 
[make unrevert interactive.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041012111740] 
[Fix compilation errors if HAVE_MAPI and HAVE_CURSES are both unset
mklooster@xxxxxxx**20041011095851] 
[update ChangeLog a bit.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041011111827] 
[don't try to generate a new name on get if name was given explicitely.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041010123829] 
[fixed a bug in changes --from-tag.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041010123136] 
[when remaking website, also remake docs.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041010105157] 
[Beatify, er, canonise myself in authors.hs.
Juliusz Chroboczek <jch@xxxxxxxxxxxxxx>**20041009171340] 
[always mark conflicts, even if there's an obvious solution.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041009115131] 
[when rerecording conflicted patch, remove the conflict.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041009104906] 
[when matching patch names, include "UNDO: " in rolled-back patches.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041008111510] 
[handle better the case where unrevert context doesn't make sense.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041008104452] 
[remove unused read_patch function.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041007120450] 
[add new slurp_recorded_and_unrecorded function.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041007120513] 
[have cgi preserve whitespace in comments
Will <will@xxxxxxxxxx>**20041007181910] 
[make cgi stylesheet location configurable
Will <will@xxxxxxxxxx>**20041007180619] 
[Clean up stringify calls in configure.ac (take 3)
Taral <taral@xxxxxxxxx>**20041005173835] 
[Clean up SignalHandler.lhs warnings
Taral <taral@xxxxxxxxx>**20041005172302] 
[Clean up External.hs warnings
Taral <taral@xxxxxxxxx>**20041005172251] 
[Use -Werror
Taral <taral@xxxxxxxxx>**20041004190657] 
[make clean didn't remove authors executable
ijones@xxxxxxxxxx**20041005031319] 
[fix linking problem with --disable-optimize
Tomasz Zielonka <t.zielonka@xxxxxxxxxxxxxxxxxxxxx>**20041005075950] 
[fix overwriting of c_context.c in tarball source.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041005112445] 
[Add RTSFLAGS to GNUmakefile
Taral <taral@xxxxxxxxx>**20041004192542] 
[Clean up Patch.lhs warnings (take 2)
Taral <taral@xxxxxxxxx>**20041004192505] 
[Make stringify put string in .rodata
Taral <taral@xxxxxxxxx>**20041004190637] 
[fix replace documentation.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041005111328] 
[really fix newlines in whatsnew -u
andrew@xxxxxxxxxxx**20041005030757] 
[fix bug in defaults processing of options with -- in them.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041005105533] 
[more win32 build fixes
Will <will@xxxxxxxxxx>**20041004173323] 
[Make clear author can be a commented email address.
Ralph Corderoy <ralph@xxxxxxxxxxxxxxx>**20041004120404
 I didn't realise that I could enter a commented email address when
 prompted.  Hence my authors.hs addition to fix up my existing patches.
 These documentation and prompt changes try to avoid this for others.
] 
[Remove unused var in Tag.lhs
Taral <taral@xxxxxxxxx>**20041003162732] 
[Clean up FastPackedString.hs warnings
Taral <taral@xxxxxxxxx>**20040928232322] 
[Clean up Context.lhs warnings
Taral <taral@xxxxxxxxx>**20040928232212] 
[Move file-specific options out of GNUmakefile
Taral <taral@xxxxxxxxx>**20040928224635] 
[can't make AUTHORS in predist, since history isn't available.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041004105119] 
[fix win32 build problem
Will <will@xxxxxxxxxx>**20041003213706] 
[TAG 1.0.0rc3
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041003114608] 

Patch bundle hash:
11d4498715bb43818997761349d29b5a679d23af

_______________________________________________
darcs-devel mailing list
darcs-devel@xxxxxxxxxxxxxxx
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
<Prev in Thread] Current Thread [Next in Thread>