projects / mw / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d52556c) | patch
pull and commit should be much more useful about conflicts
authorreagle <joseph.2008@reagle.org>
Wed, 2 Feb 2011 22:05:15 +0000 (17:05 -0500)
committerreagle <joseph.2008@reagle.org>
Wed, 2 Feb 2011 22:05:15 +0000 (17:05 -0500)
commitd49bb0b4917d905651356996988e7f82ead50101
treeaed62b73023d3ea4cbf3f7d031a098f1dd3ffe9etree | snapshot
parentd52556ced7b7f067070beacb17c735cfd3d2070ecommit | diff
pull and commit should be much more useful about conflicts
may have some bugs, but worked a few times so far
also note ordering question on line 189 demarcated by XXX
trying to sort out file v. filename which had an inconsistency; now have full_filename
src/mw/clicommands.py diff | blob | history
src/mw/metadir.py diff | blob | history
VCS-like nonsense for MediaWiki websites

Benjamin Mako Hill || Want to submit a patch?