# # # patch "NEWS" # from [5dceaa33fe301bc7691615adb4c32b4bdc2c5b2b] # to [4109c836eec71571ad7f8cca182bd780771e13a6] # # patch "UPGRADE" # from [03b9ba7f568e282f75394096310d2abc15e3ccd3] # to [611779d6d472bca3ee3f7efee88f2ab5cb4abf46] # # patch "monotone.texi" # from [c3d59165b60834650103309421732cf5dab8dfc2] # to [ee87f4b230d750666be890329395a540a1d3a2e2] # ============================================================ --- NEWS 5dceaa33fe301bc7691615adb4c32b4bdc2c5b2b +++ NEWS 4109c836eec71571ad7f8cca182bd780771e13a6 @@ -34,24 +34,28 @@ experiences. Some of the many changes: - - New textual format for revisions and manifests. They remain - conceptually the same, but have been tweaked -- manifests + - New textual format for revisions and manifests; they remain + conceptually the same, but have been tweaked. Manifests now use the same "basic_io" format as everything else in monotone, and contain entries for directories, revisions record file adds slightly differently and record directory - adds for the first time, etc. + adds for the first time, etc. Because of this format + change, revision hashes are now different; converting + rosters requires a full history rebuild and reissue of certs. - Directories are now first class. To get rid of a directory you must remove it; to create a directory, you must add it. You can add an empty directory. - Attrs are now first class. The .mt-attrs file is gone; attributes are now stored directly in the manifest. - - New merge algorithm, based on "multi-*-merge". - - And, more aggressive (and less buggy) merge - ancestor selection code + - New merge algorithm, based on "multi-*-merge", and more + aggressive, less buggy merge ancestor selection code - Netsync's core has been largely rewritten. Code is now much - clearer and reliable (though functionally very similar). + clearer and more reliable, and now includes the ability to + resume interrupted partial transfers. The netsync protocol + version number has been bumped, and netsync now runs on the + IANA-assigned port 4691 by default. - 100% fewer change_set.cc related bugs. 100% more roster.cc - related bugs. But, the idea of touching roster.cc does not + related bugs. But the idea of touching roster.cc does not terrify people. Thu Dec 29 23:10:03 PST 2005 ============================================================ --- UPGRADE 03b9ba7f568e282f75394096310d2abc15e3ccd3 +++ UPGRADE 611779d6d472bca3ee3f7efee88f2ab5cb4abf46 @@ -5,11 +5,16 @@ - 0.25 or earlier: we have modified the textual format of revisions and manifests. See NEWS before upgrading. Your project must rebuild its history; this is irreversible and creates a flag day. + You will not be able to sync revisions between pre- and post- + migration databases, and you should migrate only one database for + a project and re-fetch working databases from there. + You should probably do some test migrations locally first to make sure everything seems to be working, before running your real migration. To run the real migration: - 1) get everyone to commit and push their changes to the server; - local dbs and working copies will be broken by this + 1) get everyone to commit and push their changes to the database + chosen for migration (such as a central server if you use + one); local dbs and working copies will be broken by this migration. 2) shut down the server 3) run 'cp server.db server.db.backup' ============================================================ --- monotone.texi c3d59165b60834650103309421732cf5dab8dfc2 +++ monotone.texi ee87f4b230d750666be890329395a540a1d3a2e2 @@ -1656,7 +1656,7 @@ whether remote monotone users will be allowed access to Jim's database, identified by the named keys. -Jim then makes sure that his TCP port 5253 is open to incoming +Jim then makes sure that his TCP port 4691 is open to incoming connections, adjusting his firewall settings as necessary, and runs the monotone @command{serve} command: @@ -1667,7 +1667,7 @@ @end smallexample This command starts monotone listening on all network interfaces of -his laptop on the default port 5253, serving any branch matching +his laptop on the default port 4691, serving any branch matching @code{jp.co.juicebot.jb7*}. This will naturally include the @code{jp.co.juicebot.jb7} branch, and any sub-branches. The quotes around @code{"jp.co.juicebot.jb7*"} are there to protect the @code{*} @@ -1687,7 +1687,7 @@ monotone: setting default branch include pattern to 'jp.co.juicebot.jb7*' monotone: setting default branch exclude pattern to '' monotone: connecting to jim-laptop.juicebot.co.jp -monotone: first time connecting to server jim-laptop.juicebot.co.jp:5253 +monotone: first time connecting to server jim-laptop.juicebot.co.jp:4691 monotone: I'll assume it's really them, but you might want to double-check monotone: their key's fingerprint: 9e9e9ef1d515ad58bfaa5cf282b4a872d8fda00c monotone: warning: saving public key for jim@@juicebot.co.jp to database @@ -1855,7 +1855,7 @@ monotone: setting default branch include pattern to 'jp.co.juicebot.jb7*' monotone: setting default branch exclude pattern to '' monotone: connecting to jim-laptop.juicebot.co.jp -monotone: first time connecting to server jim-laptop.juicebot.co.jp:5253 +monotone: first time connecting to server jim-laptop.juicebot.co.jp:4691 monotone: I'll assume it's really them, but you might want to double-check monotone: their key's fingerprint: 9e9e9ef1d515ad58bfaa5cf282b4a872d8fda00c monotone: warning: saving public key for jim@@juicebot.co.jp to database @@ -2388,7 +2388,7 @@ @end group @end smallexample -This will start monotone listening on the default port (5253), but only +This will start monotone listening on the default port (4691), but only on the IP address associated with @code{www.juicebot.co.jp}. Jim can do this because his hosting provider has given him a dedicated IP address for his website. If the hosting provider offered only a single shared @@ -4029,7 +4029,7 @@ The network @var{address} specified in each case should be the same: a host name to listen on, or connect to, optionally followed by a colon -and a port number. The default port number is 5253. The @var{glob} +and a port number. The default port number is 4691. The @var{glob} parameters indicate a set of branches to exchange. Multiple @var{glob} and @option{--exclude} options can be specified; every branch which matches a @var{glob} exactly, and does not match an @var{exclude-glob},