# # # patch "UPGRADE" # from [4a77c9f53b42717353be8acc6af97fbdfbdc3505] # to [34eab337ec76974bbaa05452f08d08bb573071f4] # # patch "automate.cc" # from [240c35d1563672b59f932812acc0b6bb4d4775dc] # to [301df30a4ffe68620b87e9073f8e1b8ff7ce24c9] # # patch "botan/README.botan-monotone" # from [2b46a541b1e8a459c932dfaefe3939277fe15172] # to [6cf490f25223e0e050cf00173b1dd83445aadb9b] # # patch "contrib/ciabot_monotone.py" # from [76f59a88f784b115628179562419b3bfdf8d3ed2] # to [a0d0985191c59170341cb5573200f590931999c1] # # patch "tests/two_parent_workspace_commands_that_fail/__driver__.lua" # from [87cfff5ae2edb3eb8deca9a605d607667fa297d4] # to [6d73ba93db15b725c10967e87ac131e2e8a350fa] # # patch "win32/README" # from [acaea5a2768d42ae94b5af5bb4372a4d6f38d6d7] # to [81332b9d5ae1b1f54f360f4079bba1c21561e0ca] # # patch "win32/monotone.iss" # from [68506a90cfcbe5ad7b142568b16389ea1419d51f] # to [438bd78b53e039a6c571d583cbd44a2ba2318bed] # ============================================================ --- UPGRADE 4a77c9f53b42717353be8acc6af97fbdfbdc3505 +++ UPGRADE 34eab337ec76974bbaa05452f08d08bb573071f4 @@ -77,7 +77,7 @@ If you are upgrading from: "designated migrator", then it is still possible to preserve your branches. However, this requires some more understanding of what exactly is going on, and is outside the scope of this document. - See http://venge.net/mtn-wiki/RosterifyingPrivateBranches + See http://monotone.ca/wiki/RosterifyingPrivateBranches/ for one approach, and if you don't understand the logic behind those commands, then we're happy to explain things in more detail on the mailing list (address@hidden) or IRC (#monotone ============================================================ --- automate.cc 240c35d1563672b59f932812acc0b6bb4d4775dc +++ automate.cc 301df30a4ffe68620b87e9073f8e1b8ff7ce24c9 @@ -1018,7 +1018,7 @@ CMD_AUTOMATE(inventory, N_("[PATH]...") work.get_parent_rosters(db, parents); // for now, until we've figured out what the format could look like // and what conceptional model we can implement - // see: http://www.venge.net/mtn-wiki/MultiParentWorkspaceFallout + // see: http://monotone.ca/wiki/MultiParentWorkspaceFallout/ N(parents.size() == 1, F("this command can only be used in a single-parent workspace")); ============================================================ --- botan/README.botan-monotone 2b46a541b1e8a459c932dfaefe3939277fe15172 +++ botan/README.botan-monotone 6cf490f25223e0e050cf00173b1dd83445aadb9b @@ -28,8 +28,8 @@ 4) Make sure monotone tracks the botan f 4) Make sure monotone tracks the botan files properly - "mtn ls unknown botan/" and "mtn ls missing botan/" in n.v.m.botan. If - there are obviously renamed files, use "mtn rename" to fix them. + "mtn ls unknown botan/" and "mtn ls missing botan/" in n.v.m.botan. If + there are obviously renamed files, use "mtn rename" to fix them. Otherwise add/drop files as appropriate. Also fix up Makefile.am 5) Make monotone work with the upgraded botan library @@ -39,4 +39,4 @@ Update this file if things don't work, a might need to move some files from Attic/src/ to / in the staging branch. Update this file if things don't work, and remember to push the staging branch -to venge.net. +to monotone.ca. ============================================================ --- contrib/ciabot_monotone.py 76f59a88f784b115628179562419b3bfdf8d3ed2 +++ contrib/ciabot_monotone.py a0d0985191c59170341cb5573200f590931999c1 @@ -43,7 +43,7 @@ class config: # this script to watch the given collections at the given monotone # servers. watch_list = [ - #("venge.net", "net.venge.monotone"), + #("monotone.ca", "net.venge.monotone"), ] # If this is non-None, then the web interface will make any file 'foo' a @@ -195,9 +195,9 @@ def send_change_for(rid, m, c): """ - + substs = {} - + log = m.log(rid, 1) rev = m.get_revision(rid) # Stupid way to pull out everything inside quotes (which currently ============================================================ --- tests/two_parent_workspace_commands_that_fail/__driver__.lua 87cfff5ae2edb3eb8deca9a605d607667fa297d4 +++ tests/two_parent_workspace_commands_that_fail/__driver__.lua 6d73ba93db15b725c10967e87ac131e2e8a350fa @@ -1,6 +1,6 @@ -- Create a simple two-parent workspace and then run a bunch of -- commands all of which should give errors (but not I()s). --- see http://venge.net/mtn-wiki/MultiParentWorkspaceFallout +-- see http://monotone.ca/wiki/MultiParentWorkspaceFallout/ -- for rationales for failures mtn_setup() @@ -27,7 +27,7 @@ diffdiag = ("mtn: misuse: this workspace diag = "mtn: misuse: this command can only be used in a single-parent workspace\n" diffdiag = ("mtn: misuse: this workspace has more than one parent\n".. - "mtn: misuse: (specify a revision to diff against with --revision)\n") + "mtn: misuse: (specify a revision to diff against with --revision)\n") check(mtn("merge_into_workspace", anc), 1, nil, diag) ============================================================ --- win32/README acaea5a2768d42ae94b5af5bb4372a4d6f38d6d7 +++ win32/README 81332b9d5ae1b1f54f360f4079bba1c21561e0ca @@ -5,10 +5,10 @@ Install MinGW tools, and a monotone bina creating a MinGW release, on a fresh Windows machine: Install MinGW tools, and a monotone binary; see -http://www.venge.net/mtn-wiki/BuildingOnWindows. +http://monotone.ca/wiki/Building/Windows/ Get a copy of the monotone repository; see -http://www.venge.net/mtn-wiki/SelfHostingInfo +http://monotone.ca/wiki/SelfHostingInfo/ Check out the release version of monotone: mtn -d /path/to/monotone.db checkout -r t:monotone- monotone- ============================================================ --- win32/monotone.iss 68506a90cfcbe5ad7b142568b16389ea1419d51f +++ win32/monotone.iss 438bd78b53e039a6c571d583cbd44a2ba2318bed @@ -7,7 +7,7 @@ AppCopyright=Copyright © 2002-2008 Grayd AppVerName={#APPNAME} {#APPVERS} OutputBaseFileName={#APPNAME}-{#APPVERS}-setup AppCopyright=Copyright © 2002-2008 Graydon Hoare et al. -AppPublisher=venge.net +AppPublisher=The monotone Development Team AppPublisherURL=http://www.monotone.ca/ DefaultDirName={pf}\{#APPNAME} DefaultGroupName={#APPNAME}