From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on polar.synack.me X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.4 X-Google-Thread: 103376,a326ac15995ef20e X-Google-Attributes: gid103376,public X-Google-Language: ENGLISH,ASCII-7-bit Path: g2news2.google.com!postnews.google.com!h48g2000cwc.googlegroups.com!not-for-mail From: njs@pobox.com Newsgroups: comp.lang.ada Subject: Re: ANNOUNCE: Debian build scripts on a public Monotone server Date: 8 Oct 2006 01:49:02 -0700 Organization: http://groups.google.com Message-ID: <1160297342.239943.205770@h48g2000cwc.googlegroups.com> References: <871wpzd7js.fsf@ludovic-brenta.org> <1159259938.13504.19.camel@localhost> <1159263129.848672.286190@m7g2000cwm.googlegroups.com> <1159267398.13504.35.camel@localhost> <1159433540.824912.193400@i3g2000cwc.googlegroups.com> <1159574582.667087.127500@i3g2000cwc.googlegroups.com> <87r6xtmvc8.fsf@willow.rfc1149.net> <1159994544.336977.122140@k70g2000cwa.googlegroups.com> NNTP-Posting-Host: 66.159.194.130 Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" X-Trace: posting.google.com 1160297345 6342 127.0.0.1 (8 Oct 2006 08:49:05 GMT) X-Complaints-To: groups-abuse@google.com NNTP-Posting-Date: Sun, 8 Oct 2006 08:49:05 +0000 (UTC) User-Agent: G2/1.0 X-HTTP-UserAgent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.4) Gecko/20060406 Firefox/1.5.0.4 (Debian-1.5.dfsg+1.5.0.4-1),gzip(gfe),gzip(gfe) Complaints-To: groups-abuse@google.com Injection-Info: h48g2000cwc.googlegroups.com; posting-host=66.159.194.130; posting-account=KBzYMg0AAADyIBsProrIrDf2NIzhUvb8 Xref: g2news2.google.com comp.lang.ada:6905 Date: 2006-10-08T01:49:02-07:00 List-Id: Brian May wrote: > njs> $ mtn checkout -r GOODREV my-workspace; cd my-workspace > njs> Merge in the revision I want to kill. After this, my directory tree > njs> contains a mix of edits from both sides, some conflicts, whatever, and > njs> has both GOODREV and BADREV as parents: > njs> $ mtn merge -r BADREV > > My (test) usage of merge so far as resulted in the result being > automatically committed. Is the above usage different? Yes, that's what I meant about overhauling the merge UI :-). We're working on implementing in-workspace merge now, which should make a lot of these things more ergonomic. At the moment, merges just go through memory straight to the database, like you said. (Mostly because when we wrote the original merge code, we were still working out how to make sophisticated merging work at all, and the code was not clever enough to continue after it found a conflict. A few versions back we rewrote all of that and the new merge code is so shiny you can see your face in it, but rewriting the UI to take advantage of the new capabilities is a volunteer-time-bound process :-).) > Which brings me to a dislike of monotone, so often I see changelog messages like: > > merge of '646c7d2cca0e8dd0e97e0d8f3cc73e5a3d39ab8d' > and '87c207f4bee6cecb68e9bcc9c65c37a93c99934c' > > Unfortunately, this doesn't tell me anything. > > A manual description would be better, for example: > > Merge in bug fix for XYZ into main tree. Well, in the case you cite, the manual description would always be "merge up trunk" or something like that :-). The case where you're merging in a bug fix, you'd currently get an automated message like: propagate from branch 'com.foo.bugfix-blah' (head 9edbe23f03c59cf5da6991d11ba42a364edf9ef6) to branch 'com.foo' (head 1efba07ddd208be868a707565a26b6743d8b21ea) which is at least somewhat better, especially without the forced line breaks that google groups inserts (though it could still certainly be improved). When merges go through the workspace, of course, then the same commit message machinery will be used for merges as for normal commits. (Probably with the default being something useful, so you don't have to type "merge up trunk" over and over again.) > I believe the parents are already mentioned in the revision anyway. Yes, it is a bit silly. > I have tried to register with the BTS > https://savannah.nongnu.org/account/register.php, so I can send bug > reports, however, so far all I get is errors. Is it possible to check > if I have already registered? I stuck your name in the search box and it didn't return anything :-). Other than that I'll have to shrug and suggest you talk to the savannah admins. monotone-devel@nongnu.org is a reasonable place for bug reports too. > njs> Throw away all local changes, to make my local directory tree exactly > njs> match that seen in GOODREV (but this only effects directory contents, > njs> it doesn't affect the parent links): > njs> $ mtn revert -r GOODREV > > Have to keep that command in mind - was wondering about it. Note that the "-r" switch to revert is also a todo, not actually supported at this moment. But the actual functionality is easy to add, it's just blocked on making our "apply arbitrary changes to a workspace" logic more robust against all the crazy states workspaces can get into; revert needs to be totally bulletproof, so it currently uses a hand-coded and less flexible approach. Again, just one of those volunteer-bound processes. > njs> Commit my new tree, with its two parents: > njs> $ mtn commit --message="Clobbered BADREV" > > Looks good. Cool. :-) -- Nathaniel