Monotone

propagate from branch 'net.venge.monotone.lua-5.2' (head...

Mon, 14 May 2012 04:51:55 +0000

Commit by stephen_leake-2@stephe-leake.org on net.venge.monotone :: r53e02eaa302bc05e96a18e3882b0e9843b53cf9a / (44 files in 28 dirs): (link)

propagate from branch 'net.venge.monotone.lua-5.2' (head aad657f04d0f21ece638434694aeabc833f37aa4)
            to branch 'net.venge.monotone' (head 384d89bf03cca6815b2df2580001d67378e41d26)

* src/cmd_conflicts.cc: better fix for issue 202

Mon, 14 May 2012 04:44:13 +0000

Commit by stephen_leake-2@stephe-leake.org on net.venge.monotone :: r384d89bf03cca6815b2df2580001d67378e41d26 /src/cmd_conflicts.cc: (link)

src/cmd_conflicts.cc: better fix for issue 202

resolve issue 202 * src/cmd_conflicts.cc (CMD resolve_first): check arg count *...

Sun, 13 May 2012 05:11:30 +0000

Commit by stephen_leake-2@stephe-leake.org on net.venge.monotone :: r638fcfaa13e634672cfca872b84448bb1d785ba2 / (3 files in 3 dirs): (link)

resolve issue 202

src/cmd_conflicts.cc (CMD resolve_first): check arg count
src/unix/fs.cc: add missing header
test/func/resolve_conflicts_errors/__driver__.lua: test 'resolve_first' wrong arg count error message

explicit merge of '3ea3e8ee8014b9cf0cbe92c98dd3e4b7bc76378a' and...

Sun, 13 May 2012 05:11:29 +0000

Commit by stephen_leake-2@stephe-leake.org on net.venge.monotone :: re32ffd851f457a4a7bc651877a6cc9d18066b08b / (8 files in 5 dirs): (link)

explicit merge of '3ea3e8ee8014b9cf0cbe92c98dd3e4b7bc76378a'
              and 'f79c782efe47978eba15b1fe43faa48f63f8cf06'

'git fast import' is really 'git fast-import' Closes #205

Fri, 11 May 2012 14:17:21 +0000

Commit by Richard Levitte <richard@levitte.org> on net.venge.monotone :: rf79c782efe47978eba15b1fe43faa48f63f8cf06 /doc/monotone.texi: (link)

'git fast import' is really 'git fast-import'
Closes #205

propagate from branch 'net.venge.monotone.nfs_mount_in_workspace' (head...

Wed, 09 May 2012 14:27:45 +0000

Commit by stephen_leake-2@stephe-leake.org on net.venge.monotone :: r3ea3e8ee8014b9cf0cbe92c98dd3e4b7bc76378a / (13 files in 8 dirs): (link)

propagate from branch 'net.venge.monotone.nfs_mount_in_workspace' (head e326e60813b2c5144716140b432cc601404e2ea9)
            to branch 'net.venge.monotone' (head 2c06e0c3e391fb5cf255eccb581d586ca6618658)

* .mtn-ignore: ignore autom4te.cache

Wed, 09 May 2012 14:27:44 +0000

Commit by stephen_leake-2@stephe-leake.org on net.venge.monotone :: r2c06e0c3e391fb5cf255eccb581d586ca6618658 /.mtn-ignore: (link)

.mtn-ignore: ignore autom4te.cache

Update windows build/install instructions * .mtn-ignore: ignore autom4te.cache *...

Tue, 08 May 2012 13:29:28 +0000

Commit by stephen_leake-2@stephe-leake.org on net.venge.monotone.lua-5.2 :: raad657f04d0f21ece638434694aeabc833f37aa4 / (4 files in 2 dirs): (link)

Update windows build/install instructions

.mtn-ignore: ignore autom4te.cache
INSTALL_windows_cygwin.txt: update versions, improve.
INSTALL_windows_native.txt: update versions, improve
innosetup/README.txt: improve

Add missing func tests for 'erase_descendants' automate command I thought I...

Sat, 05 May 2012 02:31:29 +0000

Commit by Richard Hopkins <richhguard-monotone@yahoo.co.uk> on net.venge.monotone :: r9be877e20ee8b949b523e39fd8217aae119f3fda /test/func/automate_erase_descendants/__driver__.lua: (link)

Add missing func tests for 'erase_descendants' automate command

I thought I already added it in the parent commit; obviously not :)

Implement 'erase_descendants' automate command with func tests, NEWS entry and...

Sat, 05 May 2012 02:27:21 +0000

Commit by Richard Hopkins <richhguard-monotone@yahoo.co.uk> on net.venge.monotone :: rfb074f470e8850b00f87bb10369ff7f98015e4fe / (4 files in 4 dirs): (link)

Implement 'erase_descendants' automate command with func tests, NEWS entry and documentation

I've mentioned it's added in interface version 13.1 but haven't bumped it yet.
That will come in a separate commit where we mention it in NEWS as well.

* test/unit/tests/xdelta.cc: Because boost v 1.47 and 1.48 also define the L...

Wed, 02 May 2012 15:34:40 +0000

Commit by Richard Levitte <richard@levitte.org> on net.venge.monotone :: rab1768da0fde81a823a77f7b92cb6bf6f1662b45 /test/unit/tests/xdelta.cc: (link)

test/unit/tests/xdelta.cc: Because boost v 1.47 and 1.48 also define the L macro, we run into trouble if we do it first. Moving the inclusion of boost/random.hpp up a bit helps. Patch by Dan Horák

* util/audit-includes: Because some of our files sometimes have CRLF line...

Wed, 02 May 2012 13:43:16 +0000

Commit by Richard Levitte <richard@levitte.org> on net.venge.monotone :: r843bf4fa01c35f71ee512558c355c398d1d22311 /util/audit-includes: (link)

util/audit-includes: Because some of our files sometimes have CRLF line endings, audit-includes was thrown off and generated errors when there were none. Removing \r at the end of the line fixes that.

* src/unix/fs.cc: handle nfs mounted directory in workspace

Mon, 30 Apr 2012 18:25:25 +0000

Commit by stephen_leake-2@stephe-leake.org on net.venge.monotone.nfs_mount_in_workspace :: re326e60813b2c5144716140b432cc601404e2ea9 /src/unix/fs.cc: (link)

src/unix/fs.cc: handle nfs mounted directory in workspace

* doc/monotone.texi (Command Reference): add cross reference to Selectors for...

Sun, 29 Apr 2012 21:53:56 +0000

Commit by stephen_leake-2@stephe-leake.org on net.venge.monotone :: r6750cf75f86a0c65d316a01bd52c405946ea0971 /doc/monotone.texi: (link)

doc/monotone.texi (Command Reference): add cross reference to Selectors for revision options and arguments

explicit merge of '0dbadd976b0d29ec72c15be03a68a700f412cd0f' and...

Fri, 27 Apr 2012 00:49:11 +0000

Commit by stephen_leake-2@stephe-leake.org on net.venge.monotone :: red8d3ac01eadc609d02f8c14f9b40cb6f6d8ee50 / (7 files in 5 dirs): (link)

explicit merge of '0dbadd976b0d29ec72c15be03a68a700f412cd0f'
              and '7338faf653922c1c9ce0eb944f8c7c00f5e54bfd'

explicit merge of '7f35bea8a325edba1786625efa7f237311e1ec5d' and...

Fri, 27 Apr 2012 00:47:20 +0000

Commit by stephen_leake-2@stephe-leake.org on net.venge.monotone :: r7338faf653922c1c9ce0eb944f8c7c00f5e54bfd / (38 files in 25 dirs): (link)

explicit merge of '7f35bea8a325edba1786625efa7f237311e1ec5d'
              and 'd238d73a0c7bce35c65d1dd4612d8eae104612e9'

disapproval of revision 'bbfc042f41c7d2582b459470cd56ea4017a74ef4'

Fri, 27 Apr 2012 00:47:17 +0000

Commit by stephen_leake-2@stephe-leake.org on net.venge.monotone :: r7f35bea8a325edba1786625efa7f237311e1ec5d /src/unix/fs.cc: (link)

disapproval of revision 'bbfc042f41c7d2582b459470cd56ea4017a74ef4'

Add entry to NEWS about new 'min(A)' selector

Thu, 26 Apr 2012 23:12:40 +0000

Commit by Richard Hopkins <richhguard-monotone@yahoo.co.uk> on net.venge.monotone.min-selector :: r672d62dfdd81252d581a8941a69ea4f99b2359c8 /NEWS: (link)

Add entry to NEWS about new 'min(A)' selector

propagate from branch 'net.venge.monotone' (head...

Thu, 26 Apr 2012 23:12:39 +0000

Commit by Richard Hopkins <richhguard-monotone@yahoo.co.uk> on net.venge.monotone.min-selector :: r0dbadd976b0d29ec72c15be03a68a700f412cd0f / (7 files in 5 dirs): (link)

propagate from branch 'net.venge.monotone' (head d238d73a0c7bce35c65d1dd4612d8eae104612e9)
            to branch 'net.venge.monotone.min-selector' (head 672d62dfdd81252d581a8941a69ea4f99b2359c8)

Add documentation for 'min(A)' selector

Thu, 26 Apr 2012 23:12:39 +0000

Commit by Richard Hopkins <richhguard-monotone@yahoo.co.uk> on net.venge.monotone.min-selector :: ra1443faa8098d77e436b52a1b541b4f7ee2580d7 /doc/monotone.texi: (link)

Add documentation for 'min(A)' selector